diff --git a/src/views/enm_coal/power.vue b/src/views/enm_coal/power.vue
index bf1cec3f..406bea0c 100644
--- a/src/views/enm_coal/power.vue
+++ b/src/views/enm_coal/power.vue
@@ -25,7 +25,6 @@
                         <tr>
                             <th>设备名称</th>
                             <th>设备编号</th>
-                            <th>总电耗</th>
                             <th>单位</th>
                             <th>上个小时</th>
                             <th>昨日</th>
@@ -35,10 +34,10 @@
                     <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||ind==3" class="numCell">{{item1}}</td>
-                                <td v-if="ind==4" class="numCell hoursItem" @click="itemClick('hours',item1)">{{item1}}</td>
-                                <td v-if="ind==5"  class="numCell monthItem" @click="itemClick('month',item1)">{{item1}}</td>
-                                <td v-if="ind==6" class="numCell yearItem" @click="itemClick1('year',item1)">{{item1}}</td>
+                                <td  v-if="ind==0||ind==1||ind==2" class="numCell">{{item1}}</td>
+                                <td v-if="ind==3" class="numCell hoursItem" @click="itemClick('hours',item1)">{{item1}}</td>
+                                <td v-if="ind==4"  class="numCell monthItem" @click="itemClick('month',item1)">{{item1}}</td>
+                                <td v-if="ind==5" class="numCell yearItem" @click="itemClick1('year',item1)">{{item1}}</td>
                             </template>
                         </tr>
                     </tbody>
@@ -187,8 +186,8 @@ const colors =['#647bfe','#8698fe','#a9b6fe','#cbd3fe','#91CC75','#EE6666'];
                 },
                 tableName:'主要设备（100KW以上）单位产品电耗数据表',
                 tableDatas:[
-                    ['煤磨排风机主电机','','KW.h','','','',''],
-                    ['煤磨主电机','','KW.h','','','',''],
+                    ['煤磨排风机主电机','','KW·h/t','','',''],
+                    ['煤磨主电机','','KW·h/t','','',''],
                 ],
                 modelValue:true,
                 type:'hours',
@@ -328,10 +327,9 @@ const colors =['#647bfe','#8698fe','#a9b6fe','#cbd3fe','#91CC75','#EE6666'];
                             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';
-                            that.tableDatas[i][3]=data2[i].val;
+                            that.tableDatas[i][2]='KW·h/t';
                             let val = hourProduct==0?'/':(data2[i].val/hourProduct).toFixed(2);
-                            that.tableDatas[i][6]=val;
+                            that.tableDatas[i][5]=val;
                         }
                     }) 
                 }    
@@ -352,7 +350,7 @@ const colors =['#647bfe','#8698fe','#a9b6fe','#cbd3fe','#91CC75','#EE6666'];
                             let data3 = res3;
                             for (let j = 0; j < data3.length; j++) {
                                 let val = hourProduct==0?'/':(data3[j].val/hourProduct).toFixed(2);
-                                that.tableDatas[j][5]=val;   
+                                that.tableDatas[j][4]=val;   
                             }
                         })
                     }
@@ -374,7 +372,7 @@ const colors =['#647bfe','#8698fe','#a9b6fe','#cbd3fe','#91CC75','#EE6666'];
                             let data4 = res4;
                             for (let k = 0; k < data4.length; k++) {
                                 let val = hourProduct==0?'/':(data4[k].val/hourProduct).toFixed(2);
-                                that.tableDatas[k][4]=val;   
+                                that.tableDatas[k][3]=val;   
                             }
                         })
                     }    
diff --git a/src/views/enm_coal/report.vue b/src/views/enm_coal/report.vue
index e49f9c56..fededa78 100644
--- a/src/views/enm_coal/report.vue
+++ b/src/views/enm_coal/report.vue
@@ -42,7 +42,7 @@
                         <td class="numCell hoursItem" @click="itemClick('hours',item)">{{item[2]}}</td>
                         <td class="numCell daysItem" @click="itemClick('days',item)">{{item[3]}}</td>
                         <td class="numCell monthItem" @click="itemClick('month',item)">{{item[4]}}</td>
-                        <td class="numCell yearItem" @click="itemClick1('year',item)">{{item[5]}}</td>
+                        <td class="numCell yearItem" @click="itemClick('year',item)">{{item[5]}}</td>
                         <td class="numCell">{{item[6]}}</td>
                         <td class="numCell">{{item[7]}}</td>
                         <td class="numCell">{{item[8]}}</td>
diff --git a/src/views/enm_coal/teamAnalysis.vue b/src/views/enm_coal/teamAnalysis.vue
index f79d49dc..59e53a75 100644
--- a/src/views/enm_coal/teamAnalysis.vue
+++ b/src/views/enm_coal/teamAnalysis.vue
@@ -39,7 +39,7 @@
                 <table border="1"  cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
                     <thead class="myTableHead">
                         <tr>
-                            <th colspan="19">煤磨工段班组月度对比分析</th>
+                            <th colspan="20">煤磨工段班组月度对比分析</th>
                         </tr>
                         <tr>
                             <th rowspan="2">月份</th>
@@ -49,17 +49,18 @@
                             <th rowspan="2">运转率（%）</th>
                             <th colspan="2">质量</th>
                             <th colspan="8">单位产品电耗</th>
+                            <th rowspan="2">得分</th>
                         </tr>
                         <tr>
                             <th>细度（%）</th>
                             <th>水分（%）</th>
-                            <th>煤磨排风机主电机单位产品电耗（KW·h/t）</th>
-                            <th>当期单位产品电耗（kW·h/h）</th>
-                            <th>单位产品电耗目标值（kW·h/h）</th>
-                            <th>当期单位产品电耗与目标值差值（kW·h/h）</th>
-                            <th>环期单位产品电耗（kW·h/h）</th>
-                            <th>当期单位产品电耗与环期差值（kW·h/h）</th>
-                            <th>当期单位产品电耗环比增长率（%）</th>
+                            <th>煤磨排风机主电机（KW·h/t）</th>
+                            <th>当期值（kW·h/t）</th>
+                            <th>目标值（kW·h/t）</th>
+                            <th>当期与目标值差值（kW·h/t）</th>
+                            <th>环期值（kW·h/t）</th>
+                            <th>当期与环期差值（kW·h/t）</th>
+                            <th>环比增长率（%）</th>
                             <th>同比增长率（%）</th>
                         </tr>
                     </thead>
diff --git a/src/views/enm_kiln/power.vue b/src/views/enm_kiln/power.vue
index 0f067541..e51b75b6 100644
--- a/src/views/enm_kiln/power.vue
+++ b/src/views/enm_kiln/power.vue
@@ -26,7 +26,6 @@
                             <th>设备名称</th>
                             <th>设备编号</th>
                             <th>单位</th>
-                            <th>总电耗</th>
                             <th>上个小时</th>
                             <th>昨日</th>
                             <th>本月</th>
@@ -35,10 +34,10 @@
                     <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||ind==3" class="numCell">{{item1}}</td>
-                                <td v-if="ind==4" class="numCell hoursItem" @click="itemClick('hours',item1)">{{item1}}</td>
-                                <td v-if="ind==5"  class="numCell monthItem" @click="itemClick('month',item1)">{{item1}}</td>
-                                <td v-if="ind==6" class="numCell yearItem" @click="itemClick1('year',item1)">{{item1}}</td>
+                                <td  v-if="ind==0||ind==1||ind==2" class="numCell">{{item1}}</td>
+                                <td v-if="ind==3" class="numCell hoursItem" @click="itemClick('hours',item1)">{{item1}}</td>
+                                <td v-if="ind==4"  class="numCell monthItem" @click="itemClick('month',item1)">{{item1}}</td>
+                                <td v-if="ind==5" class="numCell yearItem" @click="itemClick1('year',item1)">{{item1}}</td>
                             </template>
                         </tr>
                     </tbody>
@@ -187,6 +186,8 @@
                 },
                 tableName:'主要设备（100KW以上）单位产品电耗数据表',
                 tableDatas:[
+                    ['高温风机','','KW·h/t','','',''],
+                    ['窑主电机','','KW·h/t','','',''],
                 //    {name:'高温风机',number:'NM001',unit:'KW·h/t',hours:'1',days:'24',month:'720'},
                 //    {name:'窑主电机',number:'NM002',unit:'KW·h/t',hours:'1',days:'24',month:'720'},
                 //    {name:'篦冷机一室风机电机',number:'NM003',unit:'KW·h/t',hours:'1',days:'24',month:'720'},
@@ -431,10 +432,9 @@
                             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';
-                            that.tableDatas[i][3]=data2[i].val;
+                            that.tableDatas[i][2]='KW·h/t';
                             let val = allValMonth==0?'/':(data2[i].val/allValMonth).toFixed(2);
-                            that.tableDatas[i][6]=val;
+                            that.tableDatas[i][5]=val;
                         }
                     }) 
                 }    
@@ -455,7 +455,7 @@
                             let data3 = res3;
                             for (let j = 0; j < data3.length; j++) {
                                 let val = allValDays==0?'/':(data3[j].val/allValDays).toFixed(2);
-                                that.tableDatas[j][5]=val;   
+                                that.tableDatas[j][4]=val;   
                             }
                         })
                     }
@@ -477,7 +477,7 @@
                             let data4 = res4;
                             for (let k = 0; k < data4.length; k++) {
                                 let val = hourProduct==0?'/':(data4[k].val/hourProduct).toFixed(2);
-                                that.tableDatas[k][4]=val;   
+                                that.tableDatas[k][3]=val;   
                             }
                         })
                         
diff --git a/src/views/enm_kiln/report.vue b/src/views/enm_kiln/report.vue
index 469a4e7d..a89b99bd 100644
--- a/src/views/enm_kiln/report.vue
+++ b/src/views/enm_kiln/report.vue
@@ -43,7 +43,7 @@
                         <td class="numCell hoursItem" @click="itemClick('hours',item)" >{{item[2]}}</td>
                         <td class="numCell daysItem" @click="itemClick('days',item)">{{item[3]}}</td>
                         <td class="numCell monthItem" @click="itemClick('month',item)">{{item[4]}}</td>
-                        <td class="numCell yearItem" @click="itemClick1('year',item)">{{item[5]}}</td>
+                        <td class="numCell yearItem" @click="itemClick('year',item)">{{item[5]}}</td>
                         <td class="numCell">{{item[6]}}</td>
                         <td class="numCell">{{item[7]}}</td>
                         <td class="numCell">{{item[8]}}</td>
diff --git a/src/views/enm_kiln/teamAnalysis.vue b/src/views/enm_kiln/teamAnalysis.vue
index c9f3176d..06da8d4c 100644
--- a/src/views/enm_kiln/teamAnalysis.vue
+++ b/src/views/enm_kiln/teamAnalysis.vue
@@ -47,8 +47,9 @@
                             <th colspan="2">产量</th>
                             <th>运转率</th>
                             <th>成本</th>
-                            <th colspan="8">质量</th>
-                            <th colspan="17">产品单位能耗</th>
+                            <th colspan="6">质量</th>
+                            <th colspan="12">单位产品标煤耗</th>
+                            <th colspan="7">产品单位电耗</th>
                             <th rowspan="2">得分</th>
                         </tr>
                         <tr>
@@ -62,24 +63,25 @@
                             <th>水分（%）</th>
                             <th>立升重（%）</th>
                             <th>f-CaO（%）</th>
-                            <th>高温风机单位产品标煤耗（kgce/t）</th>
-                            <th>篦冷机一室风机电机单位产品标煤耗（kgce/t）</th>
-                            <th>篦冷机三室风机电机单位产品标煤耗（kgce/t）</th>
-                            <th>篦冷机二室风机电机单位产品标煤耗（kgce/t）</th>
-                            <th>窑头排风机主电机单位产品标煤耗（kgce/t）</th>
-                            <th>当期单位产品标煤耗（kgce/t））</th>
-                            <th>单位产品标煤耗目标值（kgce/t）</th>
-                            <th>当期单位产品标煤耗与目标差值（kgce/t）</th>
-                            <th>环期单位产品标煤耗（kgce/t）</th>
-                            <th>当期单位产品标煤耗与环期差值（kgce/t）</th>
-                            <th>单位产品标煤耗环比增长率（%）</th>
-                            <th>单位产品标煤耗同比增长率（%）</th>
-                            <th>当期单位产品电耗（kW·h/h）</th>
-                            <th>单位产品电耗目标值（kW·h/h）</th>
-                            <th>当期单位产品电耗与目标值差值（kW·h/h）</th>
-                            <th>环期单位产品电耗（kW·h/h）</th>
-                            <th>当期单位产品电耗与环期差值（kW·h/h）</th>
-                            <th>当期单位产品电耗环比增长率（%）</th>
+                            <th>高温风机（kgce/t）</th>
+                            <th>篦冷机一室风机电机（kgce/t）</th>
+                            <th>篦冷机三室风机电机（kgce/t）</th>
+                            <th>篦冷机二室风机电机（kgce/t）</th>
+                            <th>窑头排风机主电机（kgce/t）</th>
+                            <th>当期值（kgce/t））</th>
+                            <th>目标值（kgce/t）</th>
+                            <th>当期与目标差值（kgce/t）</th>
+                            <th>环期值（kgce/t）</th>
+                            <th>当期与环期差值（kgce/t）</th>
+                            <th>环比增长率（%）</th>
+                            <th>同比增长率（%）</th>
+
+                            <th>当期值（kW·h/t）</th>
+                            <th>目标值（kW·h/t）</th>
+                            <th>当期与目标差值（kW·h/t）</th>
+                            <th>环期值（kW·h/t）</th>
+                            <th>当期与环期差值（kW·h/t）</th>
+                            <th>环比增长率（%）</th>
                             <th>同比增长率（%）</th>
                         </tr>
                     </thead>
diff --git a/src/views/enm_mill/power.vue b/src/views/enm_mill/power.vue
index a6059c60..021c7fb8 100644
--- a/src/views/enm_mill/power.vue
+++ b/src/views/enm_mill/power.vue
@@ -26,7 +26,6 @@
                             <th>设备名称</th>
                             <th>设备编号</th>
                             <th>单位</th>
-                            <th>总电耗</th>
                             <th>上个小时</th>
                             <th>昨日</th>
                             <th>本月</th>
@@ -35,10 +34,10 @@
                     <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||ind==3" class="numCell">{{item1}}</td>
-                                <td v-if="ind==4" class="numCell hoursItem" @click="itemClick('hours',item1)">{{item1}}</td>
-                                <td v-if="ind==5"  class="numCell monthItem" @click="itemClick('month',item1)">{{item1}}</td>
-                                <td v-if="ind==6" class="numCell yearItem" @click="itemClick1('year',item1)">{{item1}}</td>
+                                <td  v-if="ind==0||ind==1||ind==2" class="numCell">{{item1}}</td>
+                                <td v-if="ind==3" class="numCell hoursItem" @click="itemClick('hours',item1)">{{item1}}</td>
+                                <td v-if="ind==4"  class="numCell monthItem" @click="itemClick('month',item1)">{{item1}}</td>
+                                <td v-if="ind==5" class="numCell yearItem" @click="itemClick1('year',item1)">{{item1}}</td>
                             </template>
                         </tr>
                     </tbody>
@@ -187,6 +186,8 @@ const colors =['#647bfe','#8698fe','#a9b6fe','#cbd3fe','#91CC75','#EE6666'];
                 },
                 tableName:'主要设备（100KW以上）单位产品电耗数据表',
                 tableDatas:[
+                    ['循环风机1906','','KW·h/t','','',''],
+                    ['系统风机','','KW·h/t','','',''],
                 //    {name:'循环风机1906',number:'NM001',unit:'KW·h/t',hours:'',days:'',month:''},
                 //    {name:'系统风机',number:'NM002',unit:'KW·h/t',hours:'',days:'',month:''},
                 //    {name:'水平涡流选粉机1915电耗',number:'NM002',unit:'KW·h/t',hours:'',days:'',month:''},
@@ -411,10 +412,9 @@ const colors =['#647bfe','#8698fe','#a9b6fe','#cbd3fe','#91CC75','#EE6666'];
                             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';
-                            that.tableDatas[i][3]=data2[i].val;
+                            that.tableDatas[i][2]='KW·h/t';
                             let val = allValMonth==0?'/':(data2[i].val/allValMonth).toFixed(2);
-                            that.tableDatas[i][6]=val;
+                            that.tableDatas[i][5]=val;
                         }
                         debugger;
                         console.log(that.tableDatas)
@@ -437,7 +437,7 @@ const colors =['#647bfe','#8698fe','#a9b6fe','#cbd3fe','#91CC75','#EE6666'];
                             let data3 = res3;
                             for (let j = 0; j < data3.length; j++) {
                                 let val = allValDays==0?'/':(data3[j].val/allValDays).toFixed(2);
-                                that.tableDatas[j][5]=val;   
+                                that.tableDatas[j][4]=val;   
                             }
                         })
                     }
@@ -459,7 +459,7 @@ const colors =['#647bfe','#8698fe','#a9b6fe','#cbd3fe','#91CC75','#EE6666'];
                             let data4 = res4;
                             for (let k = 0; k < data4.length; k++) {
                                 let val = hourProduct==0?'/':(data4[k].val/hourProduct).toFixed(2);
-                                that.tableDatas[k][4]=val;   
+                                that.tableDatas[k][3]=val;   
                             }
                         })
                     }    
diff --git a/src/views/enm_mill/report.vue b/src/views/enm_mill/report.vue
index aa7811d9..93060587 100644
--- a/src/views/enm_mill/report.vue
+++ b/src/views/enm_mill/report.vue
@@ -42,7 +42,7 @@
                         <td class="numCell hoursItem" @click="itemClick('hours',item)">{{item[2]}}</td>
                         <td class="numCell daysItem" @click="itemClick('days',item)">{{item[3]}}</td>
                         <td class="numCell monthItem" @click="itemClick('month',item)">{{item[4]}}</td>
-                        <td class="numCell yearItem" @click="itemClick1('year',item)">{{item[5]}}</td>
+                        <td class="numCell yearItem" @click="itemClick('year',item)">{{item[5]}}</td>
                         <td class="numCell">{{item[6]}}</td>
                         <td class="numCell">{{item[7]}}</td>
                         <td class="numCell">{{item[8]}}</td>
@@ -265,7 +265,7 @@ const colors =['#647bfe','#8698fe','#a9b6fe','#cbd3fe','#91CC75','#EE6666'];
                     ['运转时间','运转时间（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],
-                    ['能耗','单位产品综合能耗（kce/t）',0,0,0,0,0,0,0,0],
+                    ['能耗','单位产品综合能耗（KW·h/t）',0,0,0,0,0,0,0,0],
                     ['成本','单位产品成本（元/吨）',0,0,0,0,0,0,0,0],
                 ],
                 tableName:'生产报告',
diff --git a/src/views/enm_mill/teamAnalysis.vue b/src/views/enm_mill/teamAnalysis.vue
index 43cfa5e3..c51255c9 100644
--- a/src/views/enm_mill/teamAnalysis.vue
+++ b/src/views/enm_mill/teamAnalysis.vue
@@ -39,7 +39,7 @@
                 <table border="1"  cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
                     <thead class="myTableHead">
                         <tr>
-                            <th colspan="19">水泥磨工段班组月度对比分析</th>
+                            <th colspan="20">水泥磨工段班组月度对比分析</th>
                         </tr>
                         <tr>
                             <th rowspan="2">月份</th>
@@ -49,6 +49,7 @@
                             <th>成本</th>
                             <th colspan="3">质量</th>
                             <th colspan="10">单位产品电耗</th>
+                            <th rowspan="2">得分</th>
                         </tr>
                         <tr>
                             <th>总产量（t）</th>
@@ -58,13 +59,13 @@
                             <th>比表面积（%）</th>
                             <th>SO3（%）</th>
                             <th>掺量（%）</th>
-                            <th>循环风机1906单位产品电耗（KW·h/t）</th>
-                            <th>系统风机单位产品电耗（KW·h/t）</th>
-                            <th>水平涡流选粉机1915电耗单位产品电耗（KW·h/t）</th>
-                            <th>目标值（kW·h/h）</th>
-                            <th>当期与目标值差值（kW·h/h）</th>
-                            <th>环期值（kW·h/h）</th>
-                            <th>当期与环期差值（kW·h/h）</th>
+                            <th>循环风机1906（KW·h/t）</th>
+                            <th>系统风机（KW·h/t）</th>
+                            <th>水平涡流选粉机1915（KW·h/t）</th>
+                            <th>目标值（kW·h/t）</th>
+                            <th>当期与目标值差值（kW·h/t）</th>
+                            <th>环期值（kW·h/t）</th>
+                            <th>当期与环期差值（kW·h/t）</th>
                             <th>环比增长率（%）</th>
                             <th>同比增长率（%）</th>
                         </tr>
diff --git a/src/views/enm_pack/report.vue b/src/views/enm_pack/report.vue
index bdc81d34..a78053fd 100644
--- a/src/views/enm_pack/report.vue
+++ b/src/views/enm_pack/report.vue
@@ -41,7 +41,7 @@
                         <td class="numCell hoursItem" @click="itemClick('hours',item)">{{item[2]}}</td>
                         <td class="numCell daysItem" @click="itemClick('days',item)">{{item[3]}}</td>
                         <td class="numCell monthItem" @click="itemClick('month',item)">{{item[4]}}</td>
-                        <td class="numCell yearItem" @click="itemClick1('year',item)">{{item[5]}}</td>
+                        <td class="numCell yearItem" @click="itemClick('year',item)">{{item[5]}}</td>
                         <td class="numCell">{{item[6]}}</td>
                         <td class="numCell">{{item[7]}}</td>
                         <td class="numCell">{{item[8]}}</td>
diff --git a/src/views/enm_pack/teamAnalysis.vue b/src/views/enm_pack/teamAnalysis.vue
index 24d5f1c9..0971200f 100644
--- a/src/views/enm_pack/teamAnalysis.vue
+++ b/src/views/enm_pack/teamAnalysis.vue
@@ -42,17 +42,20 @@
                             <th colspan="11">电水泥包装工段班组月度对比分析</th>
                         </tr>
                         <tr>
-                            <th>月份</th>
-                            <th>班组</th>
-                            <th>总产量（t）</th>
-                            <th>当期单位产品电耗（kW·h/h）</th>
-                            <th>单位产品电耗目标值（kW·h/h）</th>
-                            <th>当期单位产品电耗与目标值差值（kW·h/h）</th>
-                            <th>环期单位产品电耗（kW·h/h）</th>
-                            <th>当期单位产品电耗与环期差值（kW·h/h）</th>
-                            <th>当期单位产品电耗环比增长率（%）</th>
+                            <th rowspan="2">月份</th>
+                            <th rowspan="2">班组</th>
+                            <th rowspan="2">总产量（t）</th>
+                            <th colspan="7">当期单位产品电耗</th>
+                            <th rowspan="2">得分</th>
+                        </tr>
+                        <tr>
+                            <th>当期值（kW·h/t）</th>
+                            <th>目标值（kW·h/t）</th>
+                            <th>当期与目标值差值（kW·h/t）</th>
+                            <th>环期值（kW·h/t）</th>
+                            <th>当期与环期差值（kW·h/t）</th>
+                            <th>环比增长率（%）</th>
                             <th>同比增长率（%）</th>
-                            <th>得分</th>
                         </tr>
                     </thead>
                     <tr v-for="(item,index) in tableDatas" :key="index">
diff --git a/src/views/enm_rm/power.vue b/src/views/enm_rm/power.vue
index aeb208e6..aaddb2c4 100644
--- a/src/views/enm_rm/power.vue
+++ b/src/views/enm_rm/power.vue
@@ -26,7 +26,6 @@
                             <th>设备名称</th>
                             <th>设备编号</th>
                             <th>单位</th>
-                            <th>总电耗</th>
                             <th>上个小时</th>
                             <th>昨日</th>
                             <th>本月</th>
@@ -35,10 +34,10 @@
                     <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||ind==3" class="numCell">{{item1}}</td>
-                                <td v-if="ind==4" class="numCell hoursItem" @click="itemClick('hours',item1)">{{item1}}</td>
-                                <td v-if="ind==5"  class="numCell monthItem" @click="itemClick('month',item1)">{{item1}}</td>
-                                <td v-if="ind==6" class="numCell yearItem" @click="itemClick1('year',item1)">{{item1}}</td>
+                                <td  v-if="ind==0||ind==1||ind==2" class="numCell">{{item1}}</td>
+                                <td v-if="ind==3" class="numCell hoursItem" @click="itemClick('hours',item1)">{{item1}}</td>
+                                <td v-if="ind==4"  class="numCell monthItem" @click="itemClick('month',item1)">{{item1}}</td>
+                                <td v-if="ind==5" class="numCell yearItem" @click="itemClick1('year',item1)">{{item1}}</td>
                             </template>
                         </tr>
                     </tbody>
@@ -135,7 +134,7 @@
     let grid={
         right: '10%',
         left:'10%',
-        top:'15%'
+        top:'20%'
     };
     let toolbox={
         right:'5%',
@@ -145,7 +144,7 @@
         }
     };
     let legend= {
-        top:'5%',
+        top:'8%',
         data:['立磨主电机', '循环风机', '烘干破主', '废气风机', '尾排风机']
     };
     let yAxis= {
@@ -185,11 +184,11 @@
                 },
                 tableName:'主要设备（100KW以上）单位产品电耗数据表',
                 tableDatas:[
-                    ['立磨主电机','','KW.h','','','',''],
-                    ['循环风机','','KW.h','','','',''],
-                    ['烘干破主','','KW.h','','','',''],
-                    ['废气风机','','KW.h','','','',''],
-                    ['尾排风机','','KW.h','','','',''],
+                    ['立磨主电机','','KW·h/t','','',''],
+                    ['循环风机','','KW·h/t','','',''],
+                    // ['烘干破主','','KW·h/t','','',''],
+                    // ['废气风机','','KW·h/t','','',''],
+                    // ['尾排风机','','KW·h/t','','',''],
                 ],
                 
                 modelValue:true,
@@ -203,6 +202,10 @@
                 allValDays:0,
                 allValMonth:0,
                 option1:{
+                    title: {
+                        text: '小时生产参数统计图',
+                        x: 'center'
+                    },
                     color: colors,
                     tooltip:tooltip,
                     grid: grid,
@@ -246,6 +249,10 @@
                     ]
                 },
                 option2:{
+                    title: {
+                        text: '本月生产参数统计图',
+                        x: 'center'
+                    },
                     color: colors,
                     tooltip:tooltip,
                     grid: grid,
@@ -289,6 +296,10 @@
                     ]
                 },
                 option3:{
+                    title: {
+                        text: '本年生产参数统计图',
+                        x: 'center'
+                    },
                     color: colors,
                     tooltip:tooltip,
                     grid: grid,
@@ -375,10 +386,9 @@
                             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';
-                            that.tableDatas[i][3]=data2[i].val;
+                            that.tableDatas[i][2]='KW·h/t';
                             let val = hourProduct==0?'/':(data2[i].val/hourProduct).toFixed(2);
-                            that.tableDatas[i][6]=val;
+                            that.tableDatas[i][5]=val;
                         }
                     }) 
                 }    
@@ -399,7 +409,7 @@
                             let data3 = res3;
                             for (let j = 0; j < data3.length; j++) {
                                 let val = hourProduct==0?'/':(data3[j].val/hourProduct).toFixed(2);
-                                that.tableDatas[j][5]=val;   
+                                that.tableDatas[j][4]=val;   
                             }
                         })
                     }
@@ -421,7 +431,7 @@
                             let data4 = res4;
                             for (let k = 0; k < data4.length; k++) {
                                 let val = hourProduct==0?'/':(data4[k].val/hourProduct).toFixed(2);
-                                that.tableDatas[k][4]=val;   
+                                that.tableDatas[k][3]=val;   
                             }
                         })   
                     }    
@@ -495,7 +505,6 @@
                     let seriesData0 = [],seriesData1 = [], seriesData2 = [],seriesData3 = [],seriesData4 = [];
                     let data = response;
                     data.forEach(item => {
-                        // debugger;
                         let ind = item.day_s;
                         let val=0;
                         if(that.allValDays==0){
diff --git a/src/views/enm_rm/report.vue b/src/views/enm_rm/report.vue
index 1582a7e2..757ef8eb 100644
--- a/src/views/enm_rm/report.vue
+++ b/src/views/enm_rm/report.vue
@@ -42,7 +42,7 @@
                         <td class="numCell hoursItem" @click="itemClick('hours',item)">{{item[2]}}</td>
                         <td class="numCell daysItem" @click="itemClick('days',item)">{{item[3]}}</td>
                         <td class="numCell monthItem" @click="itemClick('month',item)">{{item[4]}}</td>
-                        <td class="numCell yearItem" @click="itemClick1('year',item)">{{item[5]}}</td>
+                        <td class="numCell yearItem" @click="itemClick('year',item)">{{item[5]}}</td>
                         <td class="numCell">{{item[6]}}</td>
                         <td class="numCell">{{item[7]}}</td>
                         <td class="numCell">{{item[8]}}</td>
diff --git a/src/views/enm_rm/teamAnalysis.vue b/src/views/enm_rm/teamAnalysis.vue
index 4a9a521b..1979333c 100644
--- a/src/views/enm_rm/teamAnalysis.vue
+++ b/src/views/enm_rm/teamAnalysis.vue
@@ -44,15 +44,15 @@
                             <th>Fe₂O₃（%）</th>
                             <th>水分（%）</th>
                             <th>CaO（%）</th>
-                            <th>循环风机单位产品电耗（KW·h/t）</th>
-                            <th>尾排风机单位产品电耗（KW·h/t）</th>
-                            <th>废气风机单位产品电耗（KW·h/t）</th>
+                            <th>循环风机（KW·h/t）</th>
+                            <th>尾排风机（KW·h/t）</th>
+                            <th>废气风机（KW·h/t）</th>
 
-                            <th>当期值（kW·h/h）</th>
-                            <th>目标值（kW·h/h）</th>
-                            <th>当期与目标差值（kW·h/h）</th>
-                            <th>环期值（kW·h/h）</th>
-                            <th>当期与环期差值（kW·h/h）</th>
+                            <th>当期值（KW·h/t）</th>
+                            <th>目标值（KW·h/t）</th>
+                            <th>当期与目标差值（KW·h/t）</th>
+                            <th>环期值（KW·h/t）</th>
+                            <th>当期与环期差值（KW·h/t）</th>
                             <th>环比增长率（%）</th>
                             <th>同比增长率（%）</th>
                         </tr>
diff --git a/src/views/enm_slag/power.vue b/src/views/enm_slag/power.vue
index 847ca6c7..6bf32bcb 100644
--- a/src/views/enm_slag/power.vue
+++ b/src/views/enm_slag/power.vue
@@ -26,7 +26,6 @@
                             <th>设备名称</th>
                             <th>设备编号</th>
                             <th>单位</th>
-                            <th>总电耗</th>
                             <th>上个小时</th>
                             <th>昨日</th>
                             <th>本月</th>
@@ -35,10 +34,10 @@
                     <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||ind==3" class="numCell">{{item1}}</td>
-                                <td v-if="ind==4" class="numCell hoursItem" @click="itemClick('hours',item1)">{{item1}}</td>
-                                <td v-if="ind==5"  class="numCell monthItem" @click="itemClick('month',item1)">{{item1}}</td>
-                                <td v-if="ind==6" class="numCell yearItem" @click="itemClick1('year',item1)">{{item1}}</td>
+                                <td  v-if="ind==0||ind==1||ind==2" class="numCell">{{item1}}</td>
+                                <td v-if="ind==3" class="numCell hoursItem" @click="itemClick('hours',item1)">{{item1}}</td>
+                                <td v-if="ind==4"  class="numCell monthItem" @click="itemClick('month',item1)">{{item1}}</td>
+                                <td v-if="ind==5" class="numCell yearItem" @click="itemClick1('year',item1)">{{item1}}</td>
                             </template>
                         </tr>
                     </tbody>
@@ -181,7 +180,7 @@
                 },
                 tableName:'主要设备（100KW以上）单位产品电耗数据表',
                 tableDatas:[
-                //    {name:'烘干破主电机',number:'NM001',unit:'KW·h/t',hours:'120',days:'2000',month:'60000'},
+                    ['烘干破主电机','','kw.h/t','','',''],
                 ],
                 modelValue:true,
                 type:'hours',
@@ -278,10 +277,9 @@
                             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';
-                            that.tableDatas[i][3]=data2[i].val;
+                            that.tableDatas[i][2]='KW·h/t';
                             let val = allValMonth==0?'/':(data2[i].val/allValMonth).toFixed(2);
-                            that.tableDatas[i][6]=val;
+                            that.tableDatas[i][5]=val;
                         }
                     }) 
                 }    
@@ -302,7 +300,7 @@
                             let data3 = res3;
                             for (let j = 0; j < data3.length; j++) {
                                 let val = allValDays==0?'/':(data3[j].val/allValDays).toFixed(2);
-                                that.tableDatas[j][5]=val;   
+                                that.tableDatas[j][4]=val;   
                             }
                         })
                     }
@@ -325,7 +323,7 @@
                             let data4 = res4;
                             for (let k = 0; k < data4.length; k++) {
                                 let val = hourProduct==0?'/':(data4[k].val/hourProduct).toFixed(2);
-                                that.tableDatas[k][4]=val;   
+                                that.tableDatas[k][3]=val;   
                             }
                         })
                         
diff --git a/src/views/enm_slag/report.vue b/src/views/enm_slag/report.vue
index 7738bed7..e471e274 100644
--- a/src/views/enm_slag/report.vue
+++ b/src/views/enm_slag/report.vue
@@ -41,7 +41,7 @@
                         <td class="numCell hoursItem" @click="itemClick('hours',item)" >{{item[2]}}</td>
                         <td class="numCell daysItem" @click="itemClick('days',item)">{{item[3]}}</td>
                         <td class="numCell monthItem" @click="itemClick('month',item)">{{item[4]}}</td>
-                        <td class="numCell yearItem" @click="itemClick1('year',item)">{{item[5]}}</td>
+                        <td class="numCell yearItem" @click="itemClick('year',item)">{{item[5]}}</td>
                         <td class="numCell">{{item[6]}}</td>
                         <td class="numCell">{{item[7]}}</td>
                         <td class="numCell">{{item[8]}}</td>
diff --git a/src/views/enm_slag/teamAnalysis.vue b/src/views/enm_slag/teamAnalysis.vue
index 13fd145d..39ec0f5a 100644
--- a/src/views/enm_slag/teamAnalysis.vue
+++ b/src/views/enm_slag/teamAnalysis.vue
@@ -42,36 +42,22 @@
                             <th colspan="12">电石渣工段班组月度对比分析</th>
                         </tr>
                         <tr>
-                            <th>月份</th>
-                            <th>班组</th>
-                            <th>总产量（t）</th>
-                            <th>单位产品成本（元）</th>
-                            <th>当期单位产品电耗（kW·h/h）</th>
-                            <th>单位产品电耗目标值（kW·h/h）</th>
-                            <th>当期单位产品电耗与目标值差值（kW·h/h）</th>
-                            <th>环期单位产品电耗（kW·h/h）</th>
-                            <th>当期单位产品电耗与环期差值（kW·h/h）</th>
-                            <th>当期单位产品电耗环比增长率（%）</th>
-                            <th>同比增长率（%）</th>
-                            <th>得分</th>
+                            <th rowspan="2">月份</th>
+                            <th rowspan="2">班组</th>
+                            <th rowspan="2">总产量（t）</th>
+                            <th rowspan="2">单位产品成本（元/吨）</th>
+                            <th colspan="7">产品单位电耗</th>
+                            <th rowspan="2">得分</th>
                         </tr>
-                        <!-- <tr>
-                            <th>总产量（t）</th>
-                            <th>台时产量（t/h）</th>
-                            <th>运转率（%）</th>
-                            <th>单位产品成本（元/吨）</th>
-                            <th>细度（%）</th>
-                            <th>Fe₂O₃（%）</th>
-                            <th>水分（%）</th>
-                            <th>CaO（%）</th>
-                            <th>当期单位产品电耗（kW·h/h）</th>
-                            <th>单位产品电耗目标值（kW·h/h）</th>
-                            <th>当期单位产品电耗与目标值差值（kW·h/h）</th>
-                            <th>环期单位产品电耗（kW·h/h）</th>
-                            <th>当期单位产品电耗与环期差值（kW·h/h）</th>
-                            <th>当期单位产品电耗环比增长率（%）</th>
+                        <tr>
+                            <th>当期值（kKW·h/t）</th>
+                            <th>目标值（kKW·h/t）</th>
+                            <th>当期与目标值差值（KW·h/t）</th>
+                            <th>环期值（KW·h/t）</th>
+                            <th>当期与环期值差值（KW·h/t）</th>
+                            <th>环比增长率（%）</th>
                             <th>同比增长率（%）</th>
-                        </tr> -->
+                        </tr>
                     </thead>
                     <tr v-for="(item,index) in tableDatas" :key="index">
                         <td v-for="(item0,index0) in item" :key="index0"  class="numCell">{{item0}}</td>