diff --git a/src/App.vue b/src/App.vue
index ed73c22b..920b5329 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -43,4 +43,26 @@
 
 <style lang="scss">
 	@import '@/style/style.scss';
+	.myTable{
+        margin-left: 37px;
+        border: 1px solid #cccccc;
+    }
+	.myTableHead{
+		background: #008080;
+		color:#ffffff;
+	}
+    .myTable th{
+		height: 40px;
+        font-weight: 500;
+    }
+    .myTable td{
+        height: 32px;
+        padding-left: 5px;
+        border: 1px solid #cccccc;
+    }
+    .numCell{
+        width: 80px;
+        height: 35px;
+        text-align: center;
+    }
 </style>
diff --git a/src/views/enm_coal/handoverLog.vue b/src/views/enm_coal/handoverLog.vue
index be3834db..bd6d66fe 100644
--- a/src/views/enm_coal/handoverLog.vue
+++ b/src/views/enm_coal/handoverLog.vue
@@ -158,9 +158,9 @@
     ></quastat-dialog>
   </template>
   <script>
-import saveDialog from "./handover_form.vue";
-import quastatDialog from "./quastat_form.vue";
-import otherDialog from "./other_form.vue";
+  import saveDialog from "./../enm_rm/handover_form.vue";
+  import quastatDialog from "./../enm_rm/quastat_form.vue";
+  import otherDialog from "./../enm_rm/other_form.vue";
   export default {
     name: "listSon",
     components: {
diff --git a/src/views/enm_coal/handover_form.vue b/src/views/enm_coal/handover_form.vue
deleted file mode 100644
index 708fb3d3..00000000
--- a/src/views/enm_coal/handover_form.vue
+++ /dev/null
@@ -1,198 +0,0 @@
-<template>
-    <el-dialog
-      :title="titleMap[mode]"
-      v-model="visible"
-      :size="1000"
-      destroy-on-close
-      @closed="$emit('closed')"
-    >
-      <el-container v-loading="loading">
-        <el-main style="padding: 0 20px 20px 20px">
-          <el-form
-            ref="dialogForm"
-            :model="form"
-            label-width="100px"
-            label-position="right"
-            :rules="rule1"
-          >
-            <el-row>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="关联工段" prop="mgroup">
-                  <el-input v-model="form.mgroup_name" placeholder="关联工段" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="当班班次" prop="shift">
-                  <el-input v-model="form.shift_name" placeholder="当班班次" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="开始时间" prop="start_time">
-                  <el-date-picker
-                      disabled
-                      v-model="form.start_time"
-                      type="datetime"
-                      format="YYYY-MM-DD HH:mm"
-                      placeholder="基础月份"
-                      style="width: 100%;"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="结束时间" prop="end_time">
-                  <el-date-picker
-                      disabled
-                      v-model="form.end_time"
-                      type="datetime"
-                      format="YYYY-MM-DD HH:mm"
-                      placeholder="对比月份"
-                      style="width: 100%;"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="当班班组" prop="team">
-                  <el-select
-                    v-model="form.team"
-                    placeholder="当班班组"
-                    clearable
-                    style="width: 100%;"
-                    @change="teamChange"
-                  >
-                    <el-option
-                    v-for="item in teamOptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="班组班长" prop="leader_name">
-                  <el-input v-model="form.leader_name" placeholder="班组班长" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col>
-                <el-form-item label="生产情况记录">
-                    <el-input
-                      type="textarea"
-                      :rows="4"
-                      v-model="form.note"
-                      placeholder="生产情况记录"
-                    />
-                  </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </el-main>
-        <el-footer>
-          <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
-          <el-button @click="visible = false">取消</el-button>
-        </el-footer>
-      </el-container>
-    </el-dialog>
-  </template>
-  <script>
-  export default {
-    emits: ["success", "closed"],
-    data() {
-      return {
-        loading: false,
-        mode: "add",
-        titleMap: {
-          add: "交接班日志",
-          edit: "交接班日志",
-          show: "查看交接班日志",
-        },
-        form: {
-          type:10,
-        },
-        rules: {
-            name: [{required: true, message: "请输入", trigger: "blur"}],
-            number: [{required: true, message: "请输入", trigger: "blur"}],
-            keeper_name: [{required: true, message: "请输入", trigger: "blur"}],
-            belong_dept: [{required: true, message: "请选择", trigger: "blur"}]
-          },
-        visible: false,
-        isSaveing: false,
-        keeperOptions: [],
-        depOptions: [],
-        selectionFilters: [],
-        setFiltersVisible: false,
-        teamOptions:[],
-        shiftOptions:[],
-      };
-    },
-    mounted() {
-      //获取班组
-      this.getTeam();
-      this.getShfit();
-    },
-    methods: {
-      getTeam(){
-        this.$API.mtm.team.list.req({page:0}).then(res=>{
-          this.teamOptions = res;
-        })
-      },
-      getShfit(){
-        this.$API.mtm.shift.req({page:0}).then(res=>{
-          this.shiftOptions = res;
-        })
-      },
-      //显示
-      open(mode = "add") {
-        this.mode = mode;
-        this.visible = true;
-        return this;
-      },
-      teamChange(data){
-        let that = this;
-        that.teamOptions.forEach(item=>{
-          if(item.id==data){
-            that.form.leader_name = item.leader_name;
-            that.form.leader= item.leader;
-          }
-        })
-      },
-      //表单提交方法
-      submit() {
-        this.$refs.dialogForm.validate(async (valid) => {
-          if (valid) {
-            this.isSaveing = true;
-            try {
-              let obj={};
-              obj.note = this.form.note;
-              obj.team = this.form.team;
-              obj.shift = this.form.shift;
-              obj.leader = this.form.leader;
-              this.$API.wpm.sflog.update.req(this.form.id,obj).then(res=>{
-                this.isSaveing = false;
-                this.$emit("success", this.form, this.mode);
-                this.visible = false;
-                this.$message.success("操作成功");
-                return res;
-              })
-            } catch (err) {
-              //可以处理校验错误
-              this.isSaveing = false;
-              return err;
-            }
-          }
-        });
-      },
-      //表单注入数据
-      setData(data) {
-        Object.assign(this.form,data);
-      },
-      //设置过滤项
-      setFilters(filters) {
-        this.selectionFilters = filters;
-        this.setFiltersVisible = true;
-      },
-    },
-  };
-  </script>
-  <style>
-  </style>
-  
\ No newline at end of file
diff --git a/src/views/enm_coal/other_form.vue b/src/views/enm_coal/other_form.vue
deleted file mode 100644
index 5706486f..00000000
--- a/src/views/enm_coal/other_form.vue
+++ /dev/null
@@ -1,189 +0,0 @@
-<template>
-    <el-dialog
-      :title="titleMap[mode]"
-      v-model="visible"
-      :size="1000"
-      destroy-on-close
-      @closed="$emit('closed')"
-    >
-      <el-container v-loading="loading">
-        <el-main style="padding: 0 20px 20px 20px">
-          <el-form
-            ref="dialogForm"
-            :model="form"
-            label-width="100px"
-            label-position="right"
-            :rules="rules"
-          >
-            <el-row>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="关联工段" prop="mgroup">
-                  <el-input v-model="form.mgroup_name" placeholder="关联工段" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="当班班次">
-                  <el-input v-model="form.shift_name" placeholder="当班班次" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="开始时间" prop="start_time">
-                  <el-input v-model="form.start_time" placeholder="结束时间" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="结束时间" prop="end_time">
-                  <el-input v-model="form.end_time" placeholder="结束时间" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="当班班组" prop="team">
-                  <el-input v-model="form.team_name" placeholder="班组班长" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="班组班长" prop="leader_name">
-                  <el-input v-model="form.leader_name" placeholder="班组班长" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="检测时间" prop="time">
-                  <el-date-picker
-                    v-model="form.time"
-                    type="datetime"
-                    value-format="YYYY-MM-DD HH:mm"
-                    format="YYYY-MM-DD HH:mm"
-                    placeholder="检测时间"
-                />
-                </el-form-item>
-              </el-col>
-              <el-col  :md="12" :sm="24" class="formUnitWrap">
-                <el-form-item label="水耗统计" prop="val">
-                    <el-input-number v-model="form.val" :precision="2" controls-position="right" placeholder="水耗统计" style="width: 100%;"></el-input-number>
-                  </el-form-item>
-                  <span class="formUnit">(t)</span>
-              </el-col>
-            </el-row>
-          </el-form>
-        </el-main>
-        <el-footer>
-          <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
-          <el-button @click="visible = false">取消</el-button>
-        </el-footer>
-      </el-container>
-    </el-dialog>
-  </template>
-  <script>
-  export default {
-    emits: ["success", "closed"],
-    data() {
-      return {
-        loading: false,
-        mode: "add",
-        titleMap: {
-          add: "其他能源录入",
-          edit: "其他能源录入",
-          show: "其他能源录入",
-        },
-        form: {
-          type:10,
-        },
-        rules: {
-            val: [{required: true, message: "请输入检测值", trigger: "blur"}],
-            time: [{required: true, message: "请选择检测时间", trigger: "blur"}]
-          },
-        visible: false,
-        isSaveing: false,
-        keeperOptions: [],
-        depOptions: [],
-        selectionFilters: [],
-        setFiltersVisible: false,
-        teamOptions:[],
-        shiftOptions:[],
-      };
-    },
-    mounted() {
-      //获取班组
-      this.getTeam();
-      this.getShfit();
-    },
-    methods: {
-      getTeam(){
-        this.$API.mtm.team.list.req({page:0}).then(res=>{
-          this.teamOptions = res;
-        })
-      },
-      getShfit(){
-        this.$API.mtm.shift.req({page:0}).then(res=>{
-          this.shiftOptions = res;
-        })
-      },
-      //显示
-      open(mode = "add") {
-        this.mode = mode;
-        this.visible = true;
-        return this;
-      },
-      teamChange(data){
-        let that = this;
-        that.teamOptions.forEach(item=>{
-          if(item.id==data){
-            that.form.leader_name = item.leader_name;
-            that.form.leader= item.leader;
-          }
-        })
-      },
-      //表单提交方法
-      submit() {
-        this.$refs.dialogForm.validate(async (valid) => {
-          if (valid) {
-            this.isSaveing = true;
-            try {
-              let obj={};
-              debugger;
-              obj.year_s = this.form.time.slice(0,4);
-              obj.month_s = this.form.time.slice(5,7);
-              obj.day_s = this.form.time.slice(8,10);
-              obj.hour = this.form.time.slice(11,13);
-              obj.val = this.form.val;
-              obj.sflog = this.form.id;
-              obj.material = '3349350755361792000';
-              obj.mpoint = '3349214860667219968';
-              this.$API.enm.mpoint.statCreate.req(obj).then(res=>{
-                this.isSaveing = false;
-                this.$emit("success", this.form, this.mode);
-                this.visible = false;
-                this.$message.success("操作成功");
-                return res;
-              })
-            } catch (err) {
-              //可以处理校验错误
-              this.isSaveing = false;
-              return err;
-            }
-          }
-        });
-      },
-      //表单注入数据
-      setData(data) {
-        Object.assign(this.form,data);
-      },
-      //设置过滤项
-      setFilters(filters) {
-        this.selectionFilters = filters;
-        this.setFiltersVisible = true;
-      },
-    },
-  };
-  </script>
-  <style>
-  .formUnit{
-    position: absolute;
-    right: -17px;
-    top: 7px;
-  }
-  .formUnitWrap{
-    position: relative;
-  }
-  </style>
-  
\ No newline at end of file
diff --git a/src/views/enm_coal/power.vue b/src/views/enm_coal/power.vue
index aa5a9746..c0a025be 100644
--- a/src/views/enm_coal/power.vue
+++ b/src/views/enm_coal/power.vue
@@ -17,9 +17,11 @@
         </el-header>
         <el-card style="margin-top:5px">
             <div ref="print" id="myReport" class="printContainer">
-                <h3 style="text-align: center;">主要设备（100KW以上）单位产品电耗数据表</h3>
-                <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable">
-                    <thead style="background: #efefef;height: 40px;">
+                <table border="1" width="1000" cellspacing="0" :key="timeStamp" class="myTable" id="myTable">
+                    <thead class="myTableHead">
+                        <tr>
+                            <th colspan="6">煤磨工段主要设备（100KW以上）单位产品电耗数据表</th>
+                        </tr>
                         <tr>
                             <th>设备名称</th>
                             <th>设备编号</th>
@@ -34,9 +36,9 @@
                             <td class="numCell">{{item.name}}</td>
                             <td class="numCell">{{item.number}}</td>
                             <td class="numCell">{{item.unit}}</td>
-                            <td class="numCell hoursItem" @click="itemClick('hours',item)" style="background: rgba(238, 179, 179, 0.8);">{{item[0]}}</td>
-                            <td class="numCell monthItem" @click="itemClick('month',item)" style="background: rgba(238, 189, 124, 0.8);">{{item[2]}}</td>
-                            <td class="numCell yearItem" @click="itemClick1('year',item)" style="background: rgba(186, 236, 135, 0.8);">{{item[3]}}</td>
+                            <td class="numCell hoursItem" @click="itemClick('hours',item)">{{item[0]}}</td>
+                            <td class="numCell monthItem" @click="itemClick('month',item)">{{item[2]}}</td>
+                            <td class="numCell yearItem" @click="itemClick1('year',item)">{{item[3]}}</td>
                         </tr>
                     </tbody>
                 </table>
@@ -183,30 +185,4 @@
     .printContainer{
         width: 1075px;
     }
-    #numTable{
-        margin-left: 37px;
-    }
-    #numTable td{
-        height: 32px;
-        padding-left: 5px;
-    }
-    .numCell{
-        width: 80px;
-        height: 35px;
-    }
-    .numCell.numCell_last{
-        width: 100px;
-    }
-    .searchHead{
-        display:flex
-    }
-    .middleText{
-        height: 32px;
-        line-height: 32px;
-        margin: 0 5px;
-        display: inline-block;
-    }
-    .searchBtn{
-        margin-left: 5px;
-    }
 </style>
\ No newline at end of file
diff --git a/src/views/enm_coal/quastat_form.vue b/src/views/enm_coal/quastat_form.vue
deleted file mode 100644
index 0ee0861d..00000000
--- a/src/views/enm_coal/quastat_form.vue
+++ /dev/null
@@ -1,253 +0,0 @@
-<template>
-    <el-dialog
-      :title="titleMap[mode]"
-      v-model="visible"
-      :size="1000"
-      destroy-on-close
-      id="bigDialog"
-      class="bigDialog"
-      @closed="$emit('closed')"
-    >
-      <el-container v-loading="loading">
-        <el-main style="padding: 0 20px 20px 20px">
-          <el-form
-          ref="dialogForm"
-          :model="form"
-          label-width="85px"
-          label-position="right"
-          :rules="rule1"
-        >
-          <el-row>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="关联工段">
-                <el-input v-model="form.mgroup_name" placeholder="关联工段" disabled/>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="当前班次">
-                <el-input v-model="form.shift_name" placeholder="当前班次" disabled/>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="当前班组">
-                <el-input v-model="form.team_name" placeholder="当前班组" disabled/>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="班组组长">
-                <el-input v-model="form.team_name" placeholder="班组组长" disabled/>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="开始时间">
-                <el-input v-model="form.start_time" placeholder="开始时间" disabled/>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="结束时间">
-                <el-input v-model="form.end_time" placeholder="结束时间" disabled/>
-              </el-form-item>
-            </el-col>
-            <el-divider />
-          </el-row>
-          
-          <!-- <el-row>
-            <el-col :lg="8" :md="12">
-              <el-form-item label="关联产物" prop="material">
-                <el-select
-                  v-model="form.material"
-                  placeholder="关联产物"
-                  clearable
-                  style="width: 100%;"
-                >
-                  <el-option
-                  v-for="item in teamOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :lg="8" :md="12">
-              <el-form-item label="质检项目" prop="testitem">
-                <el-select
-                  v-model="form.testitem"
-                  placeholder="质检项目"
-                  clearable
-                  style="width: 100%;"
-                >
-                  <el-option
-                  v-for="item in teamOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :lg="8" :md="12">
-              <el-form-item label="平均值" prop="team">
-                <el-input v-model="form.number" placeholder="平均值" />
-              </el-form-item>
-            </el-col>
-            <el-col :lg="8" :md="12">
-              <el-form-item label="检验次数" prop="mgroup">
-                <el-input v-model="form.number" placeholder="检验次数"/>
-              </el-form-item>
-            </el-col>
-            <el-col :lg="8" :md="12">
-              <el-form-item label="合格次数" prop="number">
-                <el-input v-model="form.number" placeholder="合格次数"/>
-              </el-form-item>
-            </el-col>
-            
-            <el-divider />
-          </el-row> -->
-        </el-form>
-        <sc-form-table
-          v-model="form.list"
-          :addTemplate="addTemplate"
-          placeholder="暂无数据"
-        >
-          <el-table-column prop="material" label="关联产物" min-width="150">
-            <template #default="scope">
-              <span v-if="scope.row.id">{{ scope.row.material_name }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="testitem" label="质检项目" min-width="150">
-            <template #default="scope">
-              <span v-if="scope.row.id">{{ scope.row.testitem_name }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="val_avg" label="平均值" min-width="150">
-            <template #default="scope">
-              <el-input
-                v-model="scope.row.val_avg"
-                placeholder="请输入内容"
-              ></el-input>
-            </template>
-          </el-table-column>
-          <el-table-column prop="num_test" label="检验次数" min-width="150">
-            <template #default="scope">
-              <el-input
-                v-model="scope.row.num_test"
-                placeholder="请输入内容"
-              ></el-input>
-            </template>
-          </el-table-column>
-          <el-table-column prop="num_ok" label="合格次数" min-width="150">
-            <template #default="scope">
-              <el-input
-                v-model="scope.row.num_ok"
-                placeholder="请输入内容"
-              ></el-input>
-            </template>
-          </el-table-column>
-        </sc-form-table>
-        </el-main>
-        <el-footer>
-          <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
-          <el-button @click="visible = false">取消</el-button>
-        </el-footer>
-      </el-container>
-    </el-dialog>
-  </template>
-  
-  <script>
-  export default {
-    emits: ["success", "closed"],
-    data() {
-      return {
-        addTemplate: {
-          material: "",
-          testitem: "",
-          val_avg: "",
-          num_test: "",
-          num_ok: "",
-        },
-        loading: false,
-        mode: "add",
-        titleMap: {
-          add: "质量检验",
-          edit: "质量检验",
-          show: "质量检验",
-        },
-        form: {
-          type:10,
-          list:[]
-        },
-        rules: {
-            name: [{required: true, message: "请输入", trigger: "blur"}],
-            number: [{required: true, message: "请输入", trigger: "blur"}],
-            keeper_name: [{required: true, message: "请输入", trigger: "blur"}],
-            belong_dept: [{required: true, message: "请选择", trigger: "blur"}]
-          },
-        visible: false,
-        isSaveing: false,
-        keeperOptions: [],
-        depOptions: [],
-        selectionFilters: [],
-        setFiltersVisible: false,
-        teamOptions:[],
-        shiftOptions:[],
-      };
-    },
-    mounted() {
-      //是否已经保存过
-      //若新增，调用init接口，若编辑修改，调get接口
-    },
-    methods: {
-      
-      //显示
-      open(mode = "add") {
-        this.mode = mode;
-        this.visible = true;
-        return this;
-      },
-      getReceptionist(data) {
-        this.form.leader=data.id;
-        this.form.leader_name=data.name
-      },
-      //表单提交方法
-      submit() {
-        this.isSaveing = true;
-            this.$API.qm.updateQuastat.req('bulk',this.form.list).then(res=>{
-              this.isSaveing = false;
-              this.$emit("success", this.form, this.mode);
-              this.visible = false;
-              this.$message.success("操作成功");
-            }).catch(res=>{
-              this.isSaveing = false;
-            })
-        // this.$refs.dialogForm.validate(async (valid) => {
-        //   if (valid) {
-           
-        //   }
-        // });
-      },
-      //表单注入数据
-      setData(data) {
-        Object.assign(this.form,data);
-        this.getsflogItem(this.form.id);
-      },
-      getsflogItem(id){
-        this.$API.wpm.sflog.init_test.req(id).then(res=>{
-          this.form.list = res;
-        })
-      },
-      //设置过滤项
-      setFilters(filters) {
-        this.selectionFilters = filters;
-        this.setFiltersVisible = true;
-      },
-    },
-  };
-  </script>
-  
-  <style scoped>
-  #bigDialog{
-    width: 90%;
-  }
-  </style>
-  
\ No newline at end of file
diff --git a/src/views/enm_coal/report.vue b/src/views/enm_coal/report.vue
index 7efcd5ba..196eb650 100644
--- a/src/views/enm_coal/report.vue
+++ b/src/views/enm_coal/report.vue
@@ -17,9 +17,11 @@
         </el-header>
     <el-card style="margin-top:5px">
         <div ref="print" id="myReport" class="printContainer">
-            <h3 style="text-align: center;">生产报告</h3>
-            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable">
-                <thead style="background: #efefef;height: 40px;">
+            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
+                <thead class="myTableHead">
+                    <tr>
+                        <th colspan="10">煤磨工段生产报告</th>
+                    </tr>
                     <tr>
                         <th colspan="2">参数</th>
                         <th>上个小时</th>
@@ -37,10 +39,10 @@
                         <td class="numCell" v-if="index==0||index==2" rowspan="2">{{item[0]}}</td>
                         <td class="numCell" v-else-if="index==4">{{item[0]}}</td>
                         <td class="numCell">{{item[1]}}</td>
-                        <td class="numCell hoursItem" @click="itemClick('hours',item)" style="background: rgba(238, 179, 179, 0.8);">{{item[2]}}</td>
-                        <td class="numCell daysItem" @click="itemClick('days',item)" style="background: rgba(239, 90, 90, 0.8);">{{item[3]}}</td>
-                        <td class="numCell monthItem" @click="itemClick('month',item)" style="background: rgba(238, 189, 124, 0.8);">{{item[4]}}</td>
-                        <td class="numCell yearItem" @click="itemClick1('year',item)" style="background: rgba(186, 236, 135, 0.8);">{{item[5]}}</td>
+                        <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">{{item[6]}}</td>
                         <td class="numCell">{{item[7]}}</td>
                         <td class="numCell">{{item[8]}}</td>
@@ -213,30 +215,4 @@
     .printContainer{
         width: 1075px;
     }
-    #numTable{
-        margin-left: 37px;
-    }
-    #numTable td{
-        height: 32px;
-        padding-left: 5px;
-    }
-    .numCell{
-        width: 80px;
-        height: 35px;
-    }
-    .numCell.numCell_last{
-        width: 100px;
-    }
-    .searchHead{
-        display:flex
-    }
-    .middleText{
-        height: 32px;
-        line-height: 32px;
-        margin: 0 5px;
-        display: inline-block;
-    }
-    .searchBtn{
-        margin-left: 5px;
-    }
 </style>
\ No newline at end of file
diff --git a/src/views/enm_coal/teamAnalysis.vue b/src/views/enm_coal/teamAnalysis.vue
index f650bd72..457617d9 100644
--- a/src/views/enm_coal/teamAnalysis.vue
+++ b/src/views/enm_coal/teamAnalysis.vue
@@ -36,9 +36,11 @@
         </el-header>
         <el-card style="margin-top:5px">
             <div ref="print" id="myReport" class="printContainer">
-                <h3 style="text-align: center;">主要设备（100KW以上）单位产品电耗数据表</h3>
-                <table border="1"  cellspacing="0" :key="timeStamp" id="myTable">
-                    <thead style="background: #efefef;height: 40px;">
+                <table border="1"  cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
+                    <thead class="myTableHead">
+                        <tr>
+                            <th colspan="19">煤磨工段班组月度对比分析</th>
+                        </tr>
                         <tr>
                             <th rowspan="2">月份</th>
                             <th rowspan="2">班组</th>
@@ -141,29 +143,4 @@
     .printContainer{
         width: 1075px;
     }
-    #numTable{
-        margin-left: 37px;
-    }
-    #numTable td{
-        height: 32px;
-        padding-left: 5px;
-    }
-    .numCell{
-        width: 80px;
-    }
-    .numCell.numCell_last{
-        width: 100px;
-    }
-    .searchHead{
-        display:flex
-    }
-    .middleText{
-        height: 32px;
-        line-height: 32px;
-        margin: 0 5px;
-        display: inline-block;
-    }
-    .searchBtn{
-        margin-left: 5px;
-    }
 </style>
\ No newline at end of file
diff --git a/src/views/enm_coal/workshopAnalysis.vue b/src/views/enm_coal/workshopAnalysis.vue
index 7df8e93f..aec8d0da 100644
--- a/src/views/enm_coal/workshopAnalysis.vue
+++ b/src/views/enm_coal/workshopAnalysis.vue
@@ -31,9 +31,11 @@
       </el-header>
     <el-card style="margin-top:5px">
         <div ref="print" id="myReport" class="printContainer">
-            <h3 style="text-align: center;">车间单位产品电耗月度分析表</h3>
-            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable">
-                <thead style="background: #efefef;height: 40px;">
+            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
+                <thead class="myTableHead">
+                    <tr>
+                        <th colspan="8">煤磨工段车间单位产品电耗月度分析表</th>
+                    </tr>
                     <tr>
                         <th>月份</th>
                         <th>当期值（KW·h/t）</th>
@@ -131,29 +133,4 @@
     .printContainer{
         width: 1075px;
     }
-    #numTable{
-        margin-left: 37px;
-    }
-    #numTable td{
-        height: 32px;
-        padding-left: 5px;
-    }
-    .numCell{
-        width: 80px;
-    }
-    .numCell.numCell_last{
-        width: 100px;
-    }
-    .searchHead{
-        display:flex
-    }
-    .middleText{
-        height: 32px;
-        line-height: 32px;
-        margin: 0 5px;
-        display: inline-block;
-    }
-    .searchBtn{
-        margin-left: 5px;
-    }
 </style>
\ No newline at end of file
diff --git a/src/views/enm_kiln/handoverLog.vue b/src/views/enm_kiln/handoverLog.vue
index eb972df9..8582c40f 100644
--- a/src/views/enm_kiln/handoverLog.vue
+++ b/src/views/enm_kiln/handoverLog.vue
@@ -176,9 +176,9 @@
     ></quastat-dialog>
   </template>
   <script>
-import saveDialog from "./handover_form.vue";
-import quastatDialog from "./quastat_form.vue";
-import otherDialog from "./other_form.vue";
+import saveDialog from "./../enm_rm/handover_form.vue";
+import quastatDialog from "./../enm_rm/quastat_form.vue";
+import otherDialog from "./../enm_rm/other_form.vue";
   export default {
     name: "listSon",
     components: {
diff --git a/src/views/enm_kiln/handover_form.vue b/src/views/enm_kiln/handover_form.vue
deleted file mode 100644
index 708fb3d3..00000000
--- a/src/views/enm_kiln/handover_form.vue
+++ /dev/null
@@ -1,198 +0,0 @@
-<template>
-    <el-dialog
-      :title="titleMap[mode]"
-      v-model="visible"
-      :size="1000"
-      destroy-on-close
-      @closed="$emit('closed')"
-    >
-      <el-container v-loading="loading">
-        <el-main style="padding: 0 20px 20px 20px">
-          <el-form
-            ref="dialogForm"
-            :model="form"
-            label-width="100px"
-            label-position="right"
-            :rules="rule1"
-          >
-            <el-row>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="关联工段" prop="mgroup">
-                  <el-input v-model="form.mgroup_name" placeholder="关联工段" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="当班班次" prop="shift">
-                  <el-input v-model="form.shift_name" placeholder="当班班次" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="开始时间" prop="start_time">
-                  <el-date-picker
-                      disabled
-                      v-model="form.start_time"
-                      type="datetime"
-                      format="YYYY-MM-DD HH:mm"
-                      placeholder="基础月份"
-                      style="width: 100%;"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="结束时间" prop="end_time">
-                  <el-date-picker
-                      disabled
-                      v-model="form.end_time"
-                      type="datetime"
-                      format="YYYY-MM-DD HH:mm"
-                      placeholder="对比月份"
-                      style="width: 100%;"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="当班班组" prop="team">
-                  <el-select
-                    v-model="form.team"
-                    placeholder="当班班组"
-                    clearable
-                    style="width: 100%;"
-                    @change="teamChange"
-                  >
-                    <el-option
-                    v-for="item in teamOptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="班组班长" prop="leader_name">
-                  <el-input v-model="form.leader_name" placeholder="班组班长" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col>
-                <el-form-item label="生产情况记录">
-                    <el-input
-                      type="textarea"
-                      :rows="4"
-                      v-model="form.note"
-                      placeholder="生产情况记录"
-                    />
-                  </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </el-main>
-        <el-footer>
-          <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
-          <el-button @click="visible = false">取消</el-button>
-        </el-footer>
-      </el-container>
-    </el-dialog>
-  </template>
-  <script>
-  export default {
-    emits: ["success", "closed"],
-    data() {
-      return {
-        loading: false,
-        mode: "add",
-        titleMap: {
-          add: "交接班日志",
-          edit: "交接班日志",
-          show: "查看交接班日志",
-        },
-        form: {
-          type:10,
-        },
-        rules: {
-            name: [{required: true, message: "请输入", trigger: "blur"}],
-            number: [{required: true, message: "请输入", trigger: "blur"}],
-            keeper_name: [{required: true, message: "请输入", trigger: "blur"}],
-            belong_dept: [{required: true, message: "请选择", trigger: "blur"}]
-          },
-        visible: false,
-        isSaveing: false,
-        keeperOptions: [],
-        depOptions: [],
-        selectionFilters: [],
-        setFiltersVisible: false,
-        teamOptions:[],
-        shiftOptions:[],
-      };
-    },
-    mounted() {
-      //获取班组
-      this.getTeam();
-      this.getShfit();
-    },
-    methods: {
-      getTeam(){
-        this.$API.mtm.team.list.req({page:0}).then(res=>{
-          this.teamOptions = res;
-        })
-      },
-      getShfit(){
-        this.$API.mtm.shift.req({page:0}).then(res=>{
-          this.shiftOptions = res;
-        })
-      },
-      //显示
-      open(mode = "add") {
-        this.mode = mode;
-        this.visible = true;
-        return this;
-      },
-      teamChange(data){
-        let that = this;
-        that.teamOptions.forEach(item=>{
-          if(item.id==data){
-            that.form.leader_name = item.leader_name;
-            that.form.leader= item.leader;
-          }
-        })
-      },
-      //表单提交方法
-      submit() {
-        this.$refs.dialogForm.validate(async (valid) => {
-          if (valid) {
-            this.isSaveing = true;
-            try {
-              let obj={};
-              obj.note = this.form.note;
-              obj.team = this.form.team;
-              obj.shift = this.form.shift;
-              obj.leader = this.form.leader;
-              this.$API.wpm.sflog.update.req(this.form.id,obj).then(res=>{
-                this.isSaveing = false;
-                this.$emit("success", this.form, this.mode);
-                this.visible = false;
-                this.$message.success("操作成功");
-                return res;
-              })
-            } catch (err) {
-              //可以处理校验错误
-              this.isSaveing = false;
-              return err;
-            }
-          }
-        });
-      },
-      //表单注入数据
-      setData(data) {
-        Object.assign(this.form,data);
-      },
-      //设置过滤项
-      setFilters(filters) {
-        this.selectionFilters = filters;
-        this.setFiltersVisible = true;
-      },
-    },
-  };
-  </script>
-  <style>
-  </style>
-  
\ No newline at end of file
diff --git a/src/views/enm_kiln/other_form.vue b/src/views/enm_kiln/other_form.vue
deleted file mode 100644
index 5706486f..00000000
--- a/src/views/enm_kiln/other_form.vue
+++ /dev/null
@@ -1,189 +0,0 @@
-<template>
-    <el-dialog
-      :title="titleMap[mode]"
-      v-model="visible"
-      :size="1000"
-      destroy-on-close
-      @closed="$emit('closed')"
-    >
-      <el-container v-loading="loading">
-        <el-main style="padding: 0 20px 20px 20px">
-          <el-form
-            ref="dialogForm"
-            :model="form"
-            label-width="100px"
-            label-position="right"
-            :rules="rules"
-          >
-            <el-row>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="关联工段" prop="mgroup">
-                  <el-input v-model="form.mgroup_name" placeholder="关联工段" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="当班班次">
-                  <el-input v-model="form.shift_name" placeholder="当班班次" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="开始时间" prop="start_time">
-                  <el-input v-model="form.start_time" placeholder="结束时间" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="结束时间" prop="end_time">
-                  <el-input v-model="form.end_time" placeholder="结束时间" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="当班班组" prop="team">
-                  <el-input v-model="form.team_name" placeholder="班组班长" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="班组班长" prop="leader_name">
-                  <el-input v-model="form.leader_name" placeholder="班组班长" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="检测时间" prop="time">
-                  <el-date-picker
-                    v-model="form.time"
-                    type="datetime"
-                    value-format="YYYY-MM-DD HH:mm"
-                    format="YYYY-MM-DD HH:mm"
-                    placeholder="检测时间"
-                />
-                </el-form-item>
-              </el-col>
-              <el-col  :md="12" :sm="24" class="formUnitWrap">
-                <el-form-item label="水耗统计" prop="val">
-                    <el-input-number v-model="form.val" :precision="2" controls-position="right" placeholder="水耗统计" style="width: 100%;"></el-input-number>
-                  </el-form-item>
-                  <span class="formUnit">(t)</span>
-              </el-col>
-            </el-row>
-          </el-form>
-        </el-main>
-        <el-footer>
-          <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
-          <el-button @click="visible = false">取消</el-button>
-        </el-footer>
-      </el-container>
-    </el-dialog>
-  </template>
-  <script>
-  export default {
-    emits: ["success", "closed"],
-    data() {
-      return {
-        loading: false,
-        mode: "add",
-        titleMap: {
-          add: "其他能源录入",
-          edit: "其他能源录入",
-          show: "其他能源录入",
-        },
-        form: {
-          type:10,
-        },
-        rules: {
-            val: [{required: true, message: "请输入检测值", trigger: "blur"}],
-            time: [{required: true, message: "请选择检测时间", trigger: "blur"}]
-          },
-        visible: false,
-        isSaveing: false,
-        keeperOptions: [],
-        depOptions: [],
-        selectionFilters: [],
-        setFiltersVisible: false,
-        teamOptions:[],
-        shiftOptions:[],
-      };
-    },
-    mounted() {
-      //获取班组
-      this.getTeam();
-      this.getShfit();
-    },
-    methods: {
-      getTeam(){
-        this.$API.mtm.team.list.req({page:0}).then(res=>{
-          this.teamOptions = res;
-        })
-      },
-      getShfit(){
-        this.$API.mtm.shift.req({page:0}).then(res=>{
-          this.shiftOptions = res;
-        })
-      },
-      //显示
-      open(mode = "add") {
-        this.mode = mode;
-        this.visible = true;
-        return this;
-      },
-      teamChange(data){
-        let that = this;
-        that.teamOptions.forEach(item=>{
-          if(item.id==data){
-            that.form.leader_name = item.leader_name;
-            that.form.leader= item.leader;
-          }
-        })
-      },
-      //表单提交方法
-      submit() {
-        this.$refs.dialogForm.validate(async (valid) => {
-          if (valid) {
-            this.isSaveing = true;
-            try {
-              let obj={};
-              debugger;
-              obj.year_s = this.form.time.slice(0,4);
-              obj.month_s = this.form.time.slice(5,7);
-              obj.day_s = this.form.time.slice(8,10);
-              obj.hour = this.form.time.slice(11,13);
-              obj.val = this.form.val;
-              obj.sflog = this.form.id;
-              obj.material = '3349350755361792000';
-              obj.mpoint = '3349214860667219968';
-              this.$API.enm.mpoint.statCreate.req(obj).then(res=>{
-                this.isSaveing = false;
-                this.$emit("success", this.form, this.mode);
-                this.visible = false;
-                this.$message.success("操作成功");
-                return res;
-              })
-            } catch (err) {
-              //可以处理校验错误
-              this.isSaveing = false;
-              return err;
-            }
-          }
-        });
-      },
-      //表单注入数据
-      setData(data) {
-        Object.assign(this.form,data);
-      },
-      //设置过滤项
-      setFilters(filters) {
-        this.selectionFilters = filters;
-        this.setFiltersVisible = true;
-      },
-    },
-  };
-  </script>
-  <style>
-  .formUnit{
-    position: absolute;
-    right: -17px;
-    top: 7px;
-  }
-  .formUnitWrap{
-    position: relative;
-  }
-  </style>
-  
\ No newline at end of file
diff --git a/src/views/enm_kiln/power.vue b/src/views/enm_kiln/power.vue
index 38d52fd5..9a041a85 100644
--- a/src/views/enm_kiln/power.vue
+++ b/src/views/enm_kiln/power.vue
@@ -17,9 +17,11 @@
         </el-header>
         <el-card style="margin-top:5px">
             <div ref="print" id="myReport" class="printContainer">
-                <h3 style="text-align: center;">主要设备（100KW以上）单位产品电耗数据表</h3>
-                <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable">
-                    <thead style="background: #efefef;height: 40px;">
+                <table border="1" width="1000" cellspacing="0" :key="timeStamp" class="myTable" id="myTable">
+                    <thead class="myTableHead">
+                        <tr>
+                            <th colspan="6">回转窑工段主要设备（100KW以上）单位产品电耗数据表</th>
+                        </tr>
                         <tr>
                             <th>设备名称</th>
                             <th>设备编号</th>
@@ -34,9 +36,9 @@
                             <td class="numCell">{{item.name}}</td>
                             <td class="numCell">{{item.number}}</td>
                             <td class="numCell">{{item.unit}}</td>
-                            <td class="numCell hoursItem" @click="itemClick('hours',item)" style="background: rgba(238, 179, 179, 0.8);">{{item[0]}}</td>
-                            <td class="numCell monthItem" @click="itemClick('month',item)" style="background: rgba(238, 189, 124, 0.8);">{{item[2]}}</td>
-                            <td class="numCell yearItem" @click="itemClick1('year',item)" style="background: rgba(186, 236, 135, 0.8);">{{item[3]}}</td>
+                            <td class="numCell hoursItem" @click="itemClick('hours',item)">{{item.hours}}</td>
+                            <td class="numCell monthItem" @click="itemClick('month',item)">{{item.days}}</td>
+                            <td class="numCell yearItem" @click="itemClick1('year',item)">{{item.month}}</td>
                         </tr>
                     </tbody>
                 </table>
@@ -195,30 +197,4 @@
     .printContainer{
         width: 1075px;
     }
-    #numTable{
-        margin-left: 37px;
-    }
-    #numTable td{
-        height: 32px;
-        padding-left: 5px;
-    }
-    .numCell{
-        width: 80px;
-        height: 35px;
-    }
-    .numCell.numCell_last{
-        width: 100px;
-    }
-    .searchHead{
-        display:flex
-    }
-    .middleText{
-        height: 32px;
-        line-height: 32px;
-        margin: 0 5px;
-        display: inline-block;
-    }
-    .searchBtn{
-        margin-left: 5px;
-    }
 </style>
\ No newline at end of file
diff --git a/src/views/enm_kiln/quastat_form.vue b/src/views/enm_kiln/quastat_form.vue
deleted file mode 100644
index 0ee0861d..00000000
--- a/src/views/enm_kiln/quastat_form.vue
+++ /dev/null
@@ -1,253 +0,0 @@
-<template>
-    <el-dialog
-      :title="titleMap[mode]"
-      v-model="visible"
-      :size="1000"
-      destroy-on-close
-      id="bigDialog"
-      class="bigDialog"
-      @closed="$emit('closed')"
-    >
-      <el-container v-loading="loading">
-        <el-main style="padding: 0 20px 20px 20px">
-          <el-form
-          ref="dialogForm"
-          :model="form"
-          label-width="85px"
-          label-position="right"
-          :rules="rule1"
-        >
-          <el-row>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="关联工段">
-                <el-input v-model="form.mgroup_name" placeholder="关联工段" disabled/>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="当前班次">
-                <el-input v-model="form.shift_name" placeholder="当前班次" disabled/>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="当前班组">
-                <el-input v-model="form.team_name" placeholder="当前班组" disabled/>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="班组组长">
-                <el-input v-model="form.team_name" placeholder="班组组长" disabled/>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="开始时间">
-                <el-input v-model="form.start_time" placeholder="开始时间" disabled/>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="结束时间">
-                <el-input v-model="form.end_time" placeholder="结束时间" disabled/>
-              </el-form-item>
-            </el-col>
-            <el-divider />
-          </el-row>
-          
-          <!-- <el-row>
-            <el-col :lg="8" :md="12">
-              <el-form-item label="关联产物" prop="material">
-                <el-select
-                  v-model="form.material"
-                  placeholder="关联产物"
-                  clearable
-                  style="width: 100%;"
-                >
-                  <el-option
-                  v-for="item in teamOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :lg="8" :md="12">
-              <el-form-item label="质检项目" prop="testitem">
-                <el-select
-                  v-model="form.testitem"
-                  placeholder="质检项目"
-                  clearable
-                  style="width: 100%;"
-                >
-                  <el-option
-                  v-for="item in teamOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :lg="8" :md="12">
-              <el-form-item label="平均值" prop="team">
-                <el-input v-model="form.number" placeholder="平均值" />
-              </el-form-item>
-            </el-col>
-            <el-col :lg="8" :md="12">
-              <el-form-item label="检验次数" prop="mgroup">
-                <el-input v-model="form.number" placeholder="检验次数"/>
-              </el-form-item>
-            </el-col>
-            <el-col :lg="8" :md="12">
-              <el-form-item label="合格次数" prop="number">
-                <el-input v-model="form.number" placeholder="合格次数"/>
-              </el-form-item>
-            </el-col>
-            
-            <el-divider />
-          </el-row> -->
-        </el-form>
-        <sc-form-table
-          v-model="form.list"
-          :addTemplate="addTemplate"
-          placeholder="暂无数据"
-        >
-          <el-table-column prop="material" label="关联产物" min-width="150">
-            <template #default="scope">
-              <span v-if="scope.row.id">{{ scope.row.material_name }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="testitem" label="质检项目" min-width="150">
-            <template #default="scope">
-              <span v-if="scope.row.id">{{ scope.row.testitem_name }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="val_avg" label="平均值" min-width="150">
-            <template #default="scope">
-              <el-input
-                v-model="scope.row.val_avg"
-                placeholder="请输入内容"
-              ></el-input>
-            </template>
-          </el-table-column>
-          <el-table-column prop="num_test" label="检验次数" min-width="150">
-            <template #default="scope">
-              <el-input
-                v-model="scope.row.num_test"
-                placeholder="请输入内容"
-              ></el-input>
-            </template>
-          </el-table-column>
-          <el-table-column prop="num_ok" label="合格次数" min-width="150">
-            <template #default="scope">
-              <el-input
-                v-model="scope.row.num_ok"
-                placeholder="请输入内容"
-              ></el-input>
-            </template>
-          </el-table-column>
-        </sc-form-table>
-        </el-main>
-        <el-footer>
-          <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
-          <el-button @click="visible = false">取消</el-button>
-        </el-footer>
-      </el-container>
-    </el-dialog>
-  </template>
-  
-  <script>
-  export default {
-    emits: ["success", "closed"],
-    data() {
-      return {
-        addTemplate: {
-          material: "",
-          testitem: "",
-          val_avg: "",
-          num_test: "",
-          num_ok: "",
-        },
-        loading: false,
-        mode: "add",
-        titleMap: {
-          add: "质量检验",
-          edit: "质量检验",
-          show: "质量检验",
-        },
-        form: {
-          type:10,
-          list:[]
-        },
-        rules: {
-            name: [{required: true, message: "请输入", trigger: "blur"}],
-            number: [{required: true, message: "请输入", trigger: "blur"}],
-            keeper_name: [{required: true, message: "请输入", trigger: "blur"}],
-            belong_dept: [{required: true, message: "请选择", trigger: "blur"}]
-          },
-        visible: false,
-        isSaveing: false,
-        keeperOptions: [],
-        depOptions: [],
-        selectionFilters: [],
-        setFiltersVisible: false,
-        teamOptions:[],
-        shiftOptions:[],
-      };
-    },
-    mounted() {
-      //是否已经保存过
-      //若新增，调用init接口，若编辑修改，调get接口
-    },
-    methods: {
-      
-      //显示
-      open(mode = "add") {
-        this.mode = mode;
-        this.visible = true;
-        return this;
-      },
-      getReceptionist(data) {
-        this.form.leader=data.id;
-        this.form.leader_name=data.name
-      },
-      //表单提交方法
-      submit() {
-        this.isSaveing = true;
-            this.$API.qm.updateQuastat.req('bulk',this.form.list).then(res=>{
-              this.isSaveing = false;
-              this.$emit("success", this.form, this.mode);
-              this.visible = false;
-              this.$message.success("操作成功");
-            }).catch(res=>{
-              this.isSaveing = false;
-            })
-        // this.$refs.dialogForm.validate(async (valid) => {
-        //   if (valid) {
-           
-        //   }
-        // });
-      },
-      //表单注入数据
-      setData(data) {
-        Object.assign(this.form,data);
-        this.getsflogItem(this.form.id);
-      },
-      getsflogItem(id){
-        this.$API.wpm.sflog.init_test.req(id).then(res=>{
-          this.form.list = res;
-        })
-      },
-      //设置过滤项
-      setFilters(filters) {
-        this.selectionFilters = filters;
-        this.setFiltersVisible = true;
-      },
-    },
-  };
-  </script>
-  
-  <style scoped>
-  #bigDialog{
-    width: 90%;
-  }
-  </style>
-  
\ No newline at end of file
diff --git a/src/views/enm_kiln/report.vue b/src/views/enm_kiln/report.vue
index bf3fd05c..031679e3 100644
--- a/src/views/enm_kiln/report.vue
+++ b/src/views/enm_kiln/report.vue
@@ -17,9 +17,11 @@
         </el-header>
     <el-card style="margin-top:5px">
         <div ref="print" id="myReport" class="printContainer">
-            <h3 style="text-align: center;">生产报告</h3>
-            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable">
-                <thead style="background: #efefef;height: 40px;">
+            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
+                <thead class="myTableHead">
+                    <tr>
+                        <th colspan="10">回转窑工段生产报告</th>
+                    </tr>
                     <tr>
                         <th colspan="2">参数</th>
                         <th>上个小时</th>
@@ -38,10 +40,10 @@
                         <td class="numCell" v-else-if="index==4" rowspan="4">{{ item[0] }}</td>
                         <td class="numCell" v-else-if="index==8">{{ item[0] }}</td>
                         <td class="numCell">{{item[1]}}</td>
-                        <td class="numCell hoursItem" @click="itemClick('hours',item)" style="background: rgba(238, 179, 179, 0.8);">{{item[2]}}</td>
-                        <td class="numCell daysItem" @click="itemClick('days',item)" style="background: rgba(239, 90, 90, 0.8);">{{item[3]}}</td>
-                        <td class="numCell monthItem" @click="itemClick('month',item)" style="background: rgba(238, 189, 124, 0.8);">{{item[4]}}</td>
-                        <td class="numCell yearItem" @click="itemClick1('year',item)" style="background: rgba(186, 236, 135, 0.8);">{{item[5]}}</td>
+                        <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">{{item[6]}}</td>
                         <td class="numCell">{{item[7]}}</td>
                         <td class="numCell">{{item[8]}}</td>
@@ -218,30 +220,4 @@
     .printContainer{
         width: 1075px;
     }
-    #numTable{
-        margin-left: 37px;
-    }
-    #numTable td{
-        height: 32px;
-        padding-left: 5px;
-    }
-    .numCell{
-        width: 80px;
-        height: 35px;
-    }
-    .numCell.numCell_last{
-        width: 100px;
-    }
-    .searchHead{
-        display:flex
-    }
-    .middleText{
-        height: 32px;
-        line-height: 32px;
-        margin: 0 5px;
-        display: inline-block;
-    }
-    .searchBtn{
-        margin-left: 5px;
-    }
 </style>
\ No newline at end of file
diff --git a/src/views/enm_kiln/teamAnalysis.vue b/src/views/enm_kiln/teamAnalysis.vue
index 073355af..328b4980 100644
--- a/src/views/enm_kiln/teamAnalysis.vue
+++ b/src/views/enm_kiln/teamAnalysis.vue
@@ -36,9 +36,11 @@
         </el-header>
         <el-card style="margin-top:5px">
             <div ref="print" id="myReport" class="printContainer">
-                <h3 style="text-align: center;">主要设备（100KW以上）单位产品电耗数据表</h3>
-                <table border="1"  cellspacing="0" :key="timeStamp" id="myTable">
-                    <thead style="background: #efefef;height: 40px;">
+                <table border="1"  cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
+                    <thead class="myTableHead">
+                        <tr>
+                            <th colspan="45">回转窑工段班组月度对比分析</th>
+                        </tr>
                         <tr>
                             <th rowspan="2">月份</th>
                             <th rowspan="2">班组</th>
@@ -180,29 +182,4 @@
     .printContainer{
         width: 1075px;
     }
-    #numTable{
-        margin-left: 37px;
-    }
-    #numTable td{
-        height: 32px;
-        padding-left: 5px;
-    }
-    .numCell{
-        width: 80px;
-    }
-    .numCell.numCell_last{
-        width: 100px;
-    }
-    .searchHead{
-        display:flex
-    }
-    .middleText{
-        height: 32px;
-        line-height: 32px;
-        margin: 0 5px;
-        display: inline-block;
-    }
-    .searchBtn{
-        margin-left: 5px;
-    }
 </style>
\ No newline at end of file
diff --git a/src/views/enm_kiln/workshopAnalysis.vue b/src/views/enm_kiln/workshopAnalysis.vue
index 6484cbb8..155a8505 100644
--- a/src/views/enm_kiln/workshopAnalysis.vue
+++ b/src/views/enm_kiln/workshopAnalysis.vue
@@ -31,9 +31,8 @@
       </el-header>
     <el-card style="margin-top:5px">
         <div ref="print" id="myReport" class="printContainer">
-            <h3 style="text-align: center;">车间单位产品电耗月度分析表</h3>
-            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable">
-                <thead style="background: #efefef;height: 80px;">
+            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
+                <thead class="myTableHead">
                     <tr>
                         <th colspan="8">车间单位产品电耗月度分析表</th>
                     </tr>
@@ -61,9 +60,8 @@
                     </tr>
                 </tbody>
             </table>
-            <h3 style="text-align: center;">  车间单位产品综合电耗月度分析表</h3>
-            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable1">
-                <thead style="background: #efefef;height: 120px;">
+            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable1" class="myTable">
+                <thead class="myTableHead">
                     <tr>
                         <th colspan="9">车间单位产品综合电耗月度分析表</th>
                     </tr>
@@ -96,9 +94,8 @@
                     </tr>
                 </tbody>
             </table>
-            <h3 style="text-align: center;">  车间单位产品标煤耗月度分析表</h3>
-            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable1">
-                <thead style="background: #efefef;height: 120px;">
+            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable1" class="myTable">
+                <thead class="myTableHead">
                     <tr>
                         <th colspan="9">车间单位产品标煤耗月度分析表</th>
                     </tr>
@@ -131,9 +128,8 @@
                     </tr>
                 </tbody>
             </table>
-            <h3 style="text-align: center;">  车间单位产品综合能耗月度分析表</h3>
-            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable1">
-                <thead style="background: #efefef;height: 120px;">
+            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable1" class="myTable">
+                <thead class="myTableHead">
                     <tr>
                         <th colspan="9">车间单位产品综合能耗月度分析表</th>
                     </tr>
@@ -239,29 +235,4 @@
     .printContainer{
         width: 1075px;
     }
-    #numTable{
-        margin-left: 37px;
-    }
-    #numTable td{
-        height: 32px;
-        padding-left: 5px;
-    }
-    .numCell{
-        width: 80px;
-    }
-    .numCell.numCell_last{
-        width: 100px;
-    }
-    .searchHead{
-        display:flex
-    }
-    .middleText{
-        height: 32px;
-        line-height: 32px;
-        margin: 0 5px;
-        display: inline-block;
-    }
-    .searchBtn{
-        margin-left: 5px;
-    }
 </style>
\ No newline at end of file
diff --git a/src/views/enm_mill/handoverLog.vue b/src/views/enm_mill/handoverLog.vue
index 901fefcc..a2ff391f 100644
--- a/src/views/enm_mill/handoverLog.vue
+++ b/src/views/enm_mill/handoverLog.vue
@@ -158,11 +158,11 @@
     ></quastat-dialog>
   </template>
   <script>
-import saveDialog from "./handover_form.vue";
-import quastatDialog from "./quastat_form.vue";
-import otherDialog from "./other_form.vue";
+  import saveDialog from "./../enm_rm/handover_form.vue";
+  import quastatDialog from "./../enm_rm/quastat_form.vue";
+  import otherDialog from "./../enm_rm/other_form.vue";
   export default {
-    name: "listSon",
+    name: "shuinimo",
     components: {
         saveDialog,
         otherDialog,
diff --git a/src/views/enm_mill/handover_form.vue b/src/views/enm_mill/handover_form.vue
deleted file mode 100644
index 708fb3d3..00000000
--- a/src/views/enm_mill/handover_form.vue
+++ /dev/null
@@ -1,198 +0,0 @@
-<template>
-    <el-dialog
-      :title="titleMap[mode]"
-      v-model="visible"
-      :size="1000"
-      destroy-on-close
-      @closed="$emit('closed')"
-    >
-      <el-container v-loading="loading">
-        <el-main style="padding: 0 20px 20px 20px">
-          <el-form
-            ref="dialogForm"
-            :model="form"
-            label-width="100px"
-            label-position="right"
-            :rules="rule1"
-          >
-            <el-row>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="关联工段" prop="mgroup">
-                  <el-input v-model="form.mgroup_name" placeholder="关联工段" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="当班班次" prop="shift">
-                  <el-input v-model="form.shift_name" placeholder="当班班次" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="开始时间" prop="start_time">
-                  <el-date-picker
-                      disabled
-                      v-model="form.start_time"
-                      type="datetime"
-                      format="YYYY-MM-DD HH:mm"
-                      placeholder="基础月份"
-                      style="width: 100%;"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="结束时间" prop="end_time">
-                  <el-date-picker
-                      disabled
-                      v-model="form.end_time"
-                      type="datetime"
-                      format="YYYY-MM-DD HH:mm"
-                      placeholder="对比月份"
-                      style="width: 100%;"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="当班班组" prop="team">
-                  <el-select
-                    v-model="form.team"
-                    placeholder="当班班组"
-                    clearable
-                    style="width: 100%;"
-                    @change="teamChange"
-                  >
-                    <el-option
-                    v-for="item in teamOptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="班组班长" prop="leader_name">
-                  <el-input v-model="form.leader_name" placeholder="班组班长" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col>
-                <el-form-item label="生产情况记录">
-                    <el-input
-                      type="textarea"
-                      :rows="4"
-                      v-model="form.note"
-                      placeholder="生产情况记录"
-                    />
-                  </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </el-main>
-        <el-footer>
-          <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
-          <el-button @click="visible = false">取消</el-button>
-        </el-footer>
-      </el-container>
-    </el-dialog>
-  </template>
-  <script>
-  export default {
-    emits: ["success", "closed"],
-    data() {
-      return {
-        loading: false,
-        mode: "add",
-        titleMap: {
-          add: "交接班日志",
-          edit: "交接班日志",
-          show: "查看交接班日志",
-        },
-        form: {
-          type:10,
-        },
-        rules: {
-            name: [{required: true, message: "请输入", trigger: "blur"}],
-            number: [{required: true, message: "请输入", trigger: "blur"}],
-            keeper_name: [{required: true, message: "请输入", trigger: "blur"}],
-            belong_dept: [{required: true, message: "请选择", trigger: "blur"}]
-          },
-        visible: false,
-        isSaveing: false,
-        keeperOptions: [],
-        depOptions: [],
-        selectionFilters: [],
-        setFiltersVisible: false,
-        teamOptions:[],
-        shiftOptions:[],
-      };
-    },
-    mounted() {
-      //获取班组
-      this.getTeam();
-      this.getShfit();
-    },
-    methods: {
-      getTeam(){
-        this.$API.mtm.team.list.req({page:0}).then(res=>{
-          this.teamOptions = res;
-        })
-      },
-      getShfit(){
-        this.$API.mtm.shift.req({page:0}).then(res=>{
-          this.shiftOptions = res;
-        })
-      },
-      //显示
-      open(mode = "add") {
-        this.mode = mode;
-        this.visible = true;
-        return this;
-      },
-      teamChange(data){
-        let that = this;
-        that.teamOptions.forEach(item=>{
-          if(item.id==data){
-            that.form.leader_name = item.leader_name;
-            that.form.leader= item.leader;
-          }
-        })
-      },
-      //表单提交方法
-      submit() {
-        this.$refs.dialogForm.validate(async (valid) => {
-          if (valid) {
-            this.isSaveing = true;
-            try {
-              let obj={};
-              obj.note = this.form.note;
-              obj.team = this.form.team;
-              obj.shift = this.form.shift;
-              obj.leader = this.form.leader;
-              this.$API.wpm.sflog.update.req(this.form.id,obj).then(res=>{
-                this.isSaveing = false;
-                this.$emit("success", this.form, this.mode);
-                this.visible = false;
-                this.$message.success("操作成功");
-                return res;
-              })
-            } catch (err) {
-              //可以处理校验错误
-              this.isSaveing = false;
-              return err;
-            }
-          }
-        });
-      },
-      //表单注入数据
-      setData(data) {
-        Object.assign(this.form,data);
-      },
-      //设置过滤项
-      setFilters(filters) {
-        this.selectionFilters = filters;
-        this.setFiltersVisible = true;
-      },
-    },
-  };
-  </script>
-  <style>
-  </style>
-  
\ No newline at end of file
diff --git a/src/views/enm_mill/other_form.vue b/src/views/enm_mill/other_form.vue
deleted file mode 100644
index 5706486f..00000000
--- a/src/views/enm_mill/other_form.vue
+++ /dev/null
@@ -1,189 +0,0 @@
-<template>
-    <el-dialog
-      :title="titleMap[mode]"
-      v-model="visible"
-      :size="1000"
-      destroy-on-close
-      @closed="$emit('closed')"
-    >
-      <el-container v-loading="loading">
-        <el-main style="padding: 0 20px 20px 20px">
-          <el-form
-            ref="dialogForm"
-            :model="form"
-            label-width="100px"
-            label-position="right"
-            :rules="rules"
-          >
-            <el-row>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="关联工段" prop="mgroup">
-                  <el-input v-model="form.mgroup_name" placeholder="关联工段" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="当班班次">
-                  <el-input v-model="form.shift_name" placeholder="当班班次" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="开始时间" prop="start_time">
-                  <el-input v-model="form.start_time" placeholder="结束时间" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="结束时间" prop="end_time">
-                  <el-input v-model="form.end_time" placeholder="结束时间" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="当班班组" prop="team">
-                  <el-input v-model="form.team_name" placeholder="班组班长" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="班组班长" prop="leader_name">
-                  <el-input v-model="form.leader_name" placeholder="班组班长" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="检测时间" prop="time">
-                  <el-date-picker
-                    v-model="form.time"
-                    type="datetime"
-                    value-format="YYYY-MM-DD HH:mm"
-                    format="YYYY-MM-DD HH:mm"
-                    placeholder="检测时间"
-                />
-                </el-form-item>
-              </el-col>
-              <el-col  :md="12" :sm="24" class="formUnitWrap">
-                <el-form-item label="水耗统计" prop="val">
-                    <el-input-number v-model="form.val" :precision="2" controls-position="right" placeholder="水耗统计" style="width: 100%;"></el-input-number>
-                  </el-form-item>
-                  <span class="formUnit">(t)</span>
-              </el-col>
-            </el-row>
-          </el-form>
-        </el-main>
-        <el-footer>
-          <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
-          <el-button @click="visible = false">取消</el-button>
-        </el-footer>
-      </el-container>
-    </el-dialog>
-  </template>
-  <script>
-  export default {
-    emits: ["success", "closed"],
-    data() {
-      return {
-        loading: false,
-        mode: "add",
-        titleMap: {
-          add: "其他能源录入",
-          edit: "其他能源录入",
-          show: "其他能源录入",
-        },
-        form: {
-          type:10,
-        },
-        rules: {
-            val: [{required: true, message: "请输入检测值", trigger: "blur"}],
-            time: [{required: true, message: "请选择检测时间", trigger: "blur"}]
-          },
-        visible: false,
-        isSaveing: false,
-        keeperOptions: [],
-        depOptions: [],
-        selectionFilters: [],
-        setFiltersVisible: false,
-        teamOptions:[],
-        shiftOptions:[],
-      };
-    },
-    mounted() {
-      //获取班组
-      this.getTeam();
-      this.getShfit();
-    },
-    methods: {
-      getTeam(){
-        this.$API.mtm.team.list.req({page:0}).then(res=>{
-          this.teamOptions = res;
-        })
-      },
-      getShfit(){
-        this.$API.mtm.shift.req({page:0}).then(res=>{
-          this.shiftOptions = res;
-        })
-      },
-      //显示
-      open(mode = "add") {
-        this.mode = mode;
-        this.visible = true;
-        return this;
-      },
-      teamChange(data){
-        let that = this;
-        that.teamOptions.forEach(item=>{
-          if(item.id==data){
-            that.form.leader_name = item.leader_name;
-            that.form.leader= item.leader;
-          }
-        })
-      },
-      //表单提交方法
-      submit() {
-        this.$refs.dialogForm.validate(async (valid) => {
-          if (valid) {
-            this.isSaveing = true;
-            try {
-              let obj={};
-              debugger;
-              obj.year_s = this.form.time.slice(0,4);
-              obj.month_s = this.form.time.slice(5,7);
-              obj.day_s = this.form.time.slice(8,10);
-              obj.hour = this.form.time.slice(11,13);
-              obj.val = this.form.val;
-              obj.sflog = this.form.id;
-              obj.material = '3349350755361792000';
-              obj.mpoint = '3349214860667219968';
-              this.$API.enm.mpoint.statCreate.req(obj).then(res=>{
-                this.isSaveing = false;
-                this.$emit("success", this.form, this.mode);
-                this.visible = false;
-                this.$message.success("操作成功");
-                return res;
-              })
-            } catch (err) {
-              //可以处理校验错误
-              this.isSaveing = false;
-              return err;
-            }
-          }
-        });
-      },
-      //表单注入数据
-      setData(data) {
-        Object.assign(this.form,data);
-      },
-      //设置过滤项
-      setFilters(filters) {
-        this.selectionFilters = filters;
-        this.setFiltersVisible = true;
-      },
-    },
-  };
-  </script>
-  <style>
-  .formUnit{
-    position: absolute;
-    right: -17px;
-    top: 7px;
-  }
-  .formUnitWrap{
-    position: relative;
-  }
-  </style>
-  
\ No newline at end of file
diff --git a/src/views/enm_mill/power.vue b/src/views/enm_mill/power.vue
index de282935..7cb299b9 100644
--- a/src/views/enm_mill/power.vue
+++ b/src/views/enm_mill/power.vue
@@ -17,9 +17,11 @@
         </el-header>
         <el-card style="margin-top:5px">
             <div ref="print" id="myReport" class="printContainer">
-                <h3 style="text-align: center;">主要设备（100KW以上）单位产品电耗数据表</h3>
-                <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable">
-                    <thead style="background: #efefef;height: 40px;">
+                <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
+                    <thead class="myTableHead">
+                        <tr>
+                            <th colspan="6">水泥磨工段主要设备（100KW以上）单位产品电耗数据表</th>
+                        </tr>
                         <tr>
                             <th>设备名称</th>
                             <th>设备编号</th>
@@ -34,9 +36,9 @@
                             <td class="numCell">{{item.name}}</td>
                             <td class="numCell">{{item.number}}</td>
                             <td class="numCell">{{item.unit}}</td>
-                            <td class="numCell hoursItem" @click="itemClick('hours',item)" style="background: rgba(238, 179, 179, 0.8);">{{item[0]}}</td>
-                            <td class="numCell monthItem" @click="itemClick('month',item)" style="background: rgba(238, 189, 124, 0.8);">{{item[2]}}</td>
-                            <td class="numCell yearItem" @click="itemClick1('year',item)" style="background: rgba(186, 236, 135, 0.8);">{{item[3]}}</td>
+                            <td class="numCell hoursItem" @click="itemClick('hours',item)">{{item[0]}}</td>
+                            <td class="numCell monthItem" @click="itemClick('month',item)">{{item[2]}}</td>
+                            <td class="numCell yearItem" @click="itemClick1('year',item)">{{item[3]}}</td>
                         </tr>
                     </tbody>
                 </table>
@@ -190,30 +192,4 @@
     .printContainer{
         width: 1075px;
     }
-    #numTable{
-        margin-left: 37px;
-    }
-    #numTable td{
-        height: 32px;
-        padding-left: 5px;
-    }
-    .numCell{
-        width: 80px;
-        height: 35px;
-    }
-    .numCell.numCell_last{
-        width: 100px;
-    }
-    .searchHead{
-        display:flex
-    }
-    .middleText{
-        height: 32px;
-        line-height: 32px;
-        margin: 0 5px;
-        display: inline-block;
-    }
-    .searchBtn{
-        margin-left: 5px;
-    }
 </style>
\ No newline at end of file
diff --git a/src/views/enm_mill/quastat_form.vue b/src/views/enm_mill/quastat_form.vue
deleted file mode 100644
index 0ee0861d..00000000
--- a/src/views/enm_mill/quastat_form.vue
+++ /dev/null
@@ -1,253 +0,0 @@
-<template>
-    <el-dialog
-      :title="titleMap[mode]"
-      v-model="visible"
-      :size="1000"
-      destroy-on-close
-      id="bigDialog"
-      class="bigDialog"
-      @closed="$emit('closed')"
-    >
-      <el-container v-loading="loading">
-        <el-main style="padding: 0 20px 20px 20px">
-          <el-form
-          ref="dialogForm"
-          :model="form"
-          label-width="85px"
-          label-position="right"
-          :rules="rule1"
-        >
-          <el-row>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="关联工段">
-                <el-input v-model="form.mgroup_name" placeholder="关联工段" disabled/>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="当前班次">
-                <el-input v-model="form.shift_name" placeholder="当前班次" disabled/>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="当前班组">
-                <el-input v-model="form.team_name" placeholder="当前班组" disabled/>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="班组组长">
-                <el-input v-model="form.team_name" placeholder="班组组长" disabled/>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="开始时间">
-                <el-input v-model="form.start_time" placeholder="开始时间" disabled/>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="结束时间">
-                <el-input v-model="form.end_time" placeholder="结束时间" disabled/>
-              </el-form-item>
-            </el-col>
-            <el-divider />
-          </el-row>
-          
-          <!-- <el-row>
-            <el-col :lg="8" :md="12">
-              <el-form-item label="关联产物" prop="material">
-                <el-select
-                  v-model="form.material"
-                  placeholder="关联产物"
-                  clearable
-                  style="width: 100%;"
-                >
-                  <el-option
-                  v-for="item in teamOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :lg="8" :md="12">
-              <el-form-item label="质检项目" prop="testitem">
-                <el-select
-                  v-model="form.testitem"
-                  placeholder="质检项目"
-                  clearable
-                  style="width: 100%;"
-                >
-                  <el-option
-                  v-for="item in teamOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :lg="8" :md="12">
-              <el-form-item label="平均值" prop="team">
-                <el-input v-model="form.number" placeholder="平均值" />
-              </el-form-item>
-            </el-col>
-            <el-col :lg="8" :md="12">
-              <el-form-item label="检验次数" prop="mgroup">
-                <el-input v-model="form.number" placeholder="检验次数"/>
-              </el-form-item>
-            </el-col>
-            <el-col :lg="8" :md="12">
-              <el-form-item label="合格次数" prop="number">
-                <el-input v-model="form.number" placeholder="合格次数"/>
-              </el-form-item>
-            </el-col>
-            
-            <el-divider />
-          </el-row> -->
-        </el-form>
-        <sc-form-table
-          v-model="form.list"
-          :addTemplate="addTemplate"
-          placeholder="暂无数据"
-        >
-          <el-table-column prop="material" label="关联产物" min-width="150">
-            <template #default="scope">
-              <span v-if="scope.row.id">{{ scope.row.material_name }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="testitem" label="质检项目" min-width="150">
-            <template #default="scope">
-              <span v-if="scope.row.id">{{ scope.row.testitem_name }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="val_avg" label="平均值" min-width="150">
-            <template #default="scope">
-              <el-input
-                v-model="scope.row.val_avg"
-                placeholder="请输入内容"
-              ></el-input>
-            </template>
-          </el-table-column>
-          <el-table-column prop="num_test" label="检验次数" min-width="150">
-            <template #default="scope">
-              <el-input
-                v-model="scope.row.num_test"
-                placeholder="请输入内容"
-              ></el-input>
-            </template>
-          </el-table-column>
-          <el-table-column prop="num_ok" label="合格次数" min-width="150">
-            <template #default="scope">
-              <el-input
-                v-model="scope.row.num_ok"
-                placeholder="请输入内容"
-              ></el-input>
-            </template>
-          </el-table-column>
-        </sc-form-table>
-        </el-main>
-        <el-footer>
-          <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
-          <el-button @click="visible = false">取消</el-button>
-        </el-footer>
-      </el-container>
-    </el-dialog>
-  </template>
-  
-  <script>
-  export default {
-    emits: ["success", "closed"],
-    data() {
-      return {
-        addTemplate: {
-          material: "",
-          testitem: "",
-          val_avg: "",
-          num_test: "",
-          num_ok: "",
-        },
-        loading: false,
-        mode: "add",
-        titleMap: {
-          add: "质量检验",
-          edit: "质量检验",
-          show: "质量检验",
-        },
-        form: {
-          type:10,
-          list:[]
-        },
-        rules: {
-            name: [{required: true, message: "请输入", trigger: "blur"}],
-            number: [{required: true, message: "请输入", trigger: "blur"}],
-            keeper_name: [{required: true, message: "请输入", trigger: "blur"}],
-            belong_dept: [{required: true, message: "请选择", trigger: "blur"}]
-          },
-        visible: false,
-        isSaveing: false,
-        keeperOptions: [],
-        depOptions: [],
-        selectionFilters: [],
-        setFiltersVisible: false,
-        teamOptions:[],
-        shiftOptions:[],
-      };
-    },
-    mounted() {
-      //是否已经保存过
-      //若新增，调用init接口，若编辑修改，调get接口
-    },
-    methods: {
-      
-      //显示
-      open(mode = "add") {
-        this.mode = mode;
-        this.visible = true;
-        return this;
-      },
-      getReceptionist(data) {
-        this.form.leader=data.id;
-        this.form.leader_name=data.name
-      },
-      //表单提交方法
-      submit() {
-        this.isSaveing = true;
-            this.$API.qm.updateQuastat.req('bulk',this.form.list).then(res=>{
-              this.isSaveing = false;
-              this.$emit("success", this.form, this.mode);
-              this.visible = false;
-              this.$message.success("操作成功");
-            }).catch(res=>{
-              this.isSaveing = false;
-            })
-        // this.$refs.dialogForm.validate(async (valid) => {
-        //   if (valid) {
-           
-        //   }
-        // });
-      },
-      //表单注入数据
-      setData(data) {
-        Object.assign(this.form,data);
-        this.getsflogItem(this.form.id);
-      },
-      getsflogItem(id){
-        this.$API.wpm.sflog.init_test.req(id).then(res=>{
-          this.form.list = res;
-        })
-      },
-      //设置过滤项
-      setFilters(filters) {
-        this.selectionFilters = filters;
-        this.setFiltersVisible = true;
-      },
-    },
-  };
-  </script>
-  
-  <style scoped>
-  #bigDialog{
-    width: 90%;
-  }
-  </style>
-  
\ No newline at end of file
diff --git a/src/views/enm_mill/report.vue b/src/views/enm_mill/report.vue
index eff9619a..918fed2b 100644
--- a/src/views/enm_mill/report.vue
+++ b/src/views/enm_mill/report.vue
@@ -17,9 +17,11 @@
         </el-header>
     <el-card style="margin-top:5px">
         <div ref="print" id="myReport" class="printContainer">
-            <h3 style="text-align: center;">生产报告</h3>
-            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable">
-                <thead style="background: #efefef;height: 40px;">
+            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
+                <thead class="myTableHead">
+                    <tr>
+                        <th colspan="10">水泥磨工段生产报告</th>
+                    </tr>
                     <tr>
                         <th colspan="2">参数</th>
                         <th>上个小时</th>
@@ -37,10 +39,10 @@
                         <td class="numCell" v-if="index==0||index==2||index==4" rowspan="2">{{item[0]}}</td>
                         <td class="numCell" v-else-if="index==6">{{item[0]}}</td>
                         <td class="numCell">{{item[1]}}</td>
-                        <td class="numCell hoursItem" @click="itemClick('hours',item)" style="background: rgba(238, 179, 179, 0.8);">{{item[2]}}</td>
-                        <td class="numCell daysItem" @click="itemClick('days',item)" style="background: rgba(239, 90, 90, 0.8);">{{item[3]}}</td>
-                        <td class="numCell monthItem" @click="itemClick('month',item)" style="background: rgba(238, 189, 124, 0.8);">{{item[4]}}</td>
-                        <td class="numCell yearItem" @click="itemClick1('year',item)" style="background: rgba(186, 236, 135, 0.8);">{{item[5]}}</td>
+                        <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">{{item[6]}}</td>
                         <td class="numCell">{{item[7]}}</td>
                         <td class="numCell">{{item[8]}}</td>
@@ -215,30 +217,4 @@
     .printContainer{
         width: 1075px;
     }
-    #numTable{
-        margin-left: 37px;
-    }
-    #numTable td{
-        height: 32px;
-        padding-left: 5px;
-    }
-    .numCell{
-        width: 80px;
-        height: 35px;
-    }
-    .numCell.numCell_last{
-        width: 100px;
-    }
-    .searchHead{
-        display:flex
-    }
-    .middleText{
-        height: 32px;
-        line-height: 32px;
-        margin: 0 5px;
-        display: inline-block;
-    }
-    .searchBtn{
-        margin-left: 5px;
-    }
 </style>
\ No newline at end of file
diff --git a/src/views/enm_mill/teamAnalysis.vue b/src/views/enm_mill/teamAnalysis.vue
index 2521f3e7..ce1b2dd7 100644
--- a/src/views/enm_mill/teamAnalysis.vue
+++ b/src/views/enm_mill/teamAnalysis.vue
@@ -36,9 +36,11 @@
         </el-header>
         <el-card style="margin-top:5px">
             <div ref="print" id="myReport" class="printContainer">
-                <h3 style="text-align: center;">主要设备（100KW以上）单位产品电耗数据表</h3>
-                <table border="1"  cellspacing="0" :key="timeStamp" id="myTable">
-                    <thead style="background: #efefef;height: 40px;">
+                <table border="1"  cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
+                    <thead class="myTableHead">
+                        <tr>
+                            <th colspan="19">水泥磨工段班组月度对比分析</th>
+                        </tr>
                         <tr>
                             <th rowspan="2">月份</th>
                             <th rowspan="2">班组</th>
@@ -150,29 +152,4 @@
     .printContainer{
         width: 1075px;
     }
-    #numTable{
-        margin-left: 37px;
-    }
-    #numTable td{
-        height: 32px;
-        padding-left: 5px;
-    }
-    .numCell{
-        width: 80px;
-    }
-    .numCell.numCell_last{
-        width: 100px;
-    }
-    .searchHead{
-        display:flex
-    }
-    .middleText{
-        height: 32px;
-        line-height: 32px;
-        margin: 0 5px;
-        display: inline-block;
-    }
-    .searchBtn{
-        margin-left: 5px;
-    }
 </style>
\ No newline at end of file
diff --git a/src/views/enm_mill/workshopAnalysis.vue b/src/views/enm_mill/workshopAnalysis.vue
index 770574a8..b1ff08f1 100644
--- a/src/views/enm_mill/workshopAnalysis.vue
+++ b/src/views/enm_mill/workshopAnalysis.vue
@@ -31,11 +31,10 @@
       </el-header>
     <el-card style="margin-top:5px">
         <div ref="print" id="myReport" class="printContainer">
-            <h3 style="text-align: center;">  车间单位产品电耗月度分析表</h3>
-            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable">
-                <thead style="background: #efefef;height: 120px;">
+            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
+                <thead class="myTableHead">
                     <tr>
-                        <th colspan="9">车间单位产品电耗月度分析表</th>
+                        <th colspan="9">水泥磨工段车间单位产品电耗月度分析表</th>
                     </tr>
                     <tr>
                         <th rowspan="2">月份</th>
@@ -66,11 +65,10 @@
                     </tr>
                 </tbody>
             </table>
-            <h3 style="text-align: center;">  车间单位产品综合能耗月度分析表</h3>
-            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable1">
-                <thead style="background: #efefef;height: 120px;">
+            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable1" class="myTable">
+                <thead class="myTableHead">
                     <tr>
-                        <th colspan="9">车间单位产品综合能耗月度分析表</th>
+                        <th colspan="9">水泥磨工段车间单位产品综合能耗月度分析表</th>
                     </tr>
                     <tr>
                         <th rowspan="2">月份</th>
@@ -174,29 +172,4 @@
     .printContainer{
         width: 1075px;
     }
-    #numTable{
-        margin-left: 37px;
-    }
-    #numTable td{
-        height: 32px;
-        padding-left: 5px;
-    }
-    .numCell{
-        width: 80px;
-    }
-    .numCell.numCell_last{
-        width: 100px;
-    }
-    .searchHead{
-        display:flex
-    }
-    .middleText{
-        height: 32px;
-        line-height: 32px;
-        margin: 0 5px;
-        display: inline-block;
-    }
-    .searchBtn{
-        margin-left: 5px;
-    }
 </style>
\ No newline at end of file
diff --git a/src/views/enm_pack/handoverLog.vue b/src/views/enm_pack/handoverLog.vue
index bd91c104..9761f659 100644
--- a/src/views/enm_pack/handoverLog.vue
+++ b/src/views/enm_pack/handoverLog.vue
@@ -128,13 +128,20 @@
       @success="handleSaveSuccess"
       @closed="dialog.save = false"
     ></save-dialog>
+     <other-dialog
+      v-if="dialog.other"
+      ref="otherDialog"
+      @success="handleOtherSuccess"
+      @closed="dialog.other = false"
+    ></other-dialog>
   </template>
   <script>
-import saveDialog from "./handover_form.vue";
+   import otherDialog from "./../enm_rm/other_form.vue";
+import saveDialog from "./../enm_rm/handover_form.vue";
   export default {
     name: "listSon",
     components: {
-        saveDialog,
+        saveDialog,otherDialog
     },
     data() {
       return {
@@ -146,6 +153,7 @@ import saveDialog from "./handover_form.vue";
         query2: {},
         dialog: {
           save: false,
+          other:false
         },
         sflogItem:{},
         selection: [],
@@ -189,6 +197,13 @@ import saveDialog from "./handover_form.vue";
             return err;
           });
       },
+      //其他能源物料
+     sflog_other(row){
+        this.dialog.other = true;
+        this.$nextTick(() => {
+            this.$refs.otherDialog.open("edit").setData(row);
+        });
+      },
       //新增岗位后更新数据
       handleSaveSuccess(data, mode) {
         this.$refs.table.refresh()
@@ -197,9 +212,6 @@ import saveDialog from "./handover_form.vue";
       handleOtherSuccess(){
         this.dialog.other = false;
       },
-      handleCheckSuccess(){
-        this.dialog.check = false;
-      },
       closed() {
         this.dialog.save = false;
         this.$refs.table2.refresh();
diff --git a/src/views/enm_pack/handover_form.vue b/src/views/enm_pack/handover_form.vue
deleted file mode 100644
index 708fb3d3..00000000
--- a/src/views/enm_pack/handover_form.vue
+++ /dev/null
@@ -1,198 +0,0 @@
-<template>
-    <el-dialog
-      :title="titleMap[mode]"
-      v-model="visible"
-      :size="1000"
-      destroy-on-close
-      @closed="$emit('closed')"
-    >
-      <el-container v-loading="loading">
-        <el-main style="padding: 0 20px 20px 20px">
-          <el-form
-            ref="dialogForm"
-            :model="form"
-            label-width="100px"
-            label-position="right"
-            :rules="rule1"
-          >
-            <el-row>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="关联工段" prop="mgroup">
-                  <el-input v-model="form.mgroup_name" placeholder="关联工段" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="当班班次" prop="shift">
-                  <el-input v-model="form.shift_name" placeholder="当班班次" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="开始时间" prop="start_time">
-                  <el-date-picker
-                      disabled
-                      v-model="form.start_time"
-                      type="datetime"
-                      format="YYYY-MM-DD HH:mm"
-                      placeholder="基础月份"
-                      style="width: 100%;"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="结束时间" prop="end_time">
-                  <el-date-picker
-                      disabled
-                      v-model="form.end_time"
-                      type="datetime"
-                      format="YYYY-MM-DD HH:mm"
-                      placeholder="对比月份"
-                      style="width: 100%;"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="当班班组" prop="team">
-                  <el-select
-                    v-model="form.team"
-                    placeholder="当班班组"
-                    clearable
-                    style="width: 100%;"
-                    @change="teamChange"
-                  >
-                    <el-option
-                    v-for="item in teamOptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="班组班长" prop="leader_name">
-                  <el-input v-model="form.leader_name" placeholder="班组班长" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col>
-                <el-form-item label="生产情况记录">
-                    <el-input
-                      type="textarea"
-                      :rows="4"
-                      v-model="form.note"
-                      placeholder="生产情况记录"
-                    />
-                  </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </el-main>
-        <el-footer>
-          <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
-          <el-button @click="visible = false">取消</el-button>
-        </el-footer>
-      </el-container>
-    </el-dialog>
-  </template>
-  <script>
-  export default {
-    emits: ["success", "closed"],
-    data() {
-      return {
-        loading: false,
-        mode: "add",
-        titleMap: {
-          add: "交接班日志",
-          edit: "交接班日志",
-          show: "查看交接班日志",
-        },
-        form: {
-          type:10,
-        },
-        rules: {
-            name: [{required: true, message: "请输入", trigger: "blur"}],
-            number: [{required: true, message: "请输入", trigger: "blur"}],
-            keeper_name: [{required: true, message: "请输入", trigger: "blur"}],
-            belong_dept: [{required: true, message: "请选择", trigger: "blur"}]
-          },
-        visible: false,
-        isSaveing: false,
-        keeperOptions: [],
-        depOptions: [],
-        selectionFilters: [],
-        setFiltersVisible: false,
-        teamOptions:[],
-        shiftOptions:[],
-      };
-    },
-    mounted() {
-      //获取班组
-      this.getTeam();
-      this.getShfit();
-    },
-    methods: {
-      getTeam(){
-        this.$API.mtm.team.list.req({page:0}).then(res=>{
-          this.teamOptions = res;
-        })
-      },
-      getShfit(){
-        this.$API.mtm.shift.req({page:0}).then(res=>{
-          this.shiftOptions = res;
-        })
-      },
-      //显示
-      open(mode = "add") {
-        this.mode = mode;
-        this.visible = true;
-        return this;
-      },
-      teamChange(data){
-        let that = this;
-        that.teamOptions.forEach(item=>{
-          if(item.id==data){
-            that.form.leader_name = item.leader_name;
-            that.form.leader= item.leader;
-          }
-        })
-      },
-      //表单提交方法
-      submit() {
-        this.$refs.dialogForm.validate(async (valid) => {
-          if (valid) {
-            this.isSaveing = true;
-            try {
-              let obj={};
-              obj.note = this.form.note;
-              obj.team = this.form.team;
-              obj.shift = this.form.shift;
-              obj.leader = this.form.leader;
-              this.$API.wpm.sflog.update.req(this.form.id,obj).then(res=>{
-                this.isSaveing = false;
-                this.$emit("success", this.form, this.mode);
-                this.visible = false;
-                this.$message.success("操作成功");
-                return res;
-              })
-            } catch (err) {
-              //可以处理校验错误
-              this.isSaveing = false;
-              return err;
-            }
-          }
-        });
-      },
-      //表单注入数据
-      setData(data) {
-        Object.assign(this.form,data);
-      },
-      //设置过滤项
-      setFilters(filters) {
-        this.selectionFilters = filters;
-        this.setFiltersVisible = true;
-      },
-    },
-  };
-  </script>
-  <style>
-  </style>
-  
\ No newline at end of file
diff --git a/src/views/enm_pack/other_form.vue b/src/views/enm_pack/other_form.vue
deleted file mode 100644
index 5706486f..00000000
--- a/src/views/enm_pack/other_form.vue
+++ /dev/null
@@ -1,189 +0,0 @@
-<template>
-    <el-dialog
-      :title="titleMap[mode]"
-      v-model="visible"
-      :size="1000"
-      destroy-on-close
-      @closed="$emit('closed')"
-    >
-      <el-container v-loading="loading">
-        <el-main style="padding: 0 20px 20px 20px">
-          <el-form
-            ref="dialogForm"
-            :model="form"
-            label-width="100px"
-            label-position="right"
-            :rules="rules"
-          >
-            <el-row>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="关联工段" prop="mgroup">
-                  <el-input v-model="form.mgroup_name" placeholder="关联工段" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="当班班次">
-                  <el-input v-model="form.shift_name" placeholder="当班班次" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="开始时间" prop="start_time">
-                  <el-input v-model="form.start_time" placeholder="结束时间" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="结束时间" prop="end_time">
-                  <el-input v-model="form.end_time" placeholder="结束时间" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="当班班组" prop="team">
-                  <el-input v-model="form.team_name" placeholder="班组班长" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="班组班长" prop="leader_name">
-                  <el-input v-model="form.leader_name" placeholder="班组班长" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="检测时间" prop="time">
-                  <el-date-picker
-                    v-model="form.time"
-                    type="datetime"
-                    value-format="YYYY-MM-DD HH:mm"
-                    format="YYYY-MM-DD HH:mm"
-                    placeholder="检测时间"
-                />
-                </el-form-item>
-              </el-col>
-              <el-col  :md="12" :sm="24" class="formUnitWrap">
-                <el-form-item label="水耗统计" prop="val">
-                    <el-input-number v-model="form.val" :precision="2" controls-position="right" placeholder="水耗统计" style="width: 100%;"></el-input-number>
-                  </el-form-item>
-                  <span class="formUnit">(t)</span>
-              </el-col>
-            </el-row>
-          </el-form>
-        </el-main>
-        <el-footer>
-          <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
-          <el-button @click="visible = false">取消</el-button>
-        </el-footer>
-      </el-container>
-    </el-dialog>
-  </template>
-  <script>
-  export default {
-    emits: ["success", "closed"],
-    data() {
-      return {
-        loading: false,
-        mode: "add",
-        titleMap: {
-          add: "其他能源录入",
-          edit: "其他能源录入",
-          show: "其他能源录入",
-        },
-        form: {
-          type:10,
-        },
-        rules: {
-            val: [{required: true, message: "请输入检测值", trigger: "blur"}],
-            time: [{required: true, message: "请选择检测时间", trigger: "blur"}]
-          },
-        visible: false,
-        isSaveing: false,
-        keeperOptions: [],
-        depOptions: [],
-        selectionFilters: [],
-        setFiltersVisible: false,
-        teamOptions:[],
-        shiftOptions:[],
-      };
-    },
-    mounted() {
-      //获取班组
-      this.getTeam();
-      this.getShfit();
-    },
-    methods: {
-      getTeam(){
-        this.$API.mtm.team.list.req({page:0}).then(res=>{
-          this.teamOptions = res;
-        })
-      },
-      getShfit(){
-        this.$API.mtm.shift.req({page:0}).then(res=>{
-          this.shiftOptions = res;
-        })
-      },
-      //显示
-      open(mode = "add") {
-        this.mode = mode;
-        this.visible = true;
-        return this;
-      },
-      teamChange(data){
-        let that = this;
-        that.teamOptions.forEach(item=>{
-          if(item.id==data){
-            that.form.leader_name = item.leader_name;
-            that.form.leader= item.leader;
-          }
-        })
-      },
-      //表单提交方法
-      submit() {
-        this.$refs.dialogForm.validate(async (valid) => {
-          if (valid) {
-            this.isSaveing = true;
-            try {
-              let obj={};
-              debugger;
-              obj.year_s = this.form.time.slice(0,4);
-              obj.month_s = this.form.time.slice(5,7);
-              obj.day_s = this.form.time.slice(8,10);
-              obj.hour = this.form.time.slice(11,13);
-              obj.val = this.form.val;
-              obj.sflog = this.form.id;
-              obj.material = '3349350755361792000';
-              obj.mpoint = '3349214860667219968';
-              this.$API.enm.mpoint.statCreate.req(obj).then(res=>{
-                this.isSaveing = false;
-                this.$emit("success", this.form, this.mode);
-                this.visible = false;
-                this.$message.success("操作成功");
-                return res;
-              })
-            } catch (err) {
-              //可以处理校验错误
-              this.isSaveing = false;
-              return err;
-            }
-          }
-        });
-      },
-      //表单注入数据
-      setData(data) {
-        Object.assign(this.form,data);
-      },
-      //设置过滤项
-      setFilters(filters) {
-        this.selectionFilters = filters;
-        this.setFiltersVisible = true;
-      },
-    },
-  };
-  </script>
-  <style>
-  .formUnit{
-    position: absolute;
-    right: -17px;
-    top: 7px;
-  }
-  .formUnitWrap{
-    position: relative;
-  }
-  </style>
-  
\ No newline at end of file
diff --git a/src/views/enm_pack/power.vue b/src/views/enm_pack/power.vue
index 7015e353..5dd85524 100644
--- a/src/views/enm_pack/power.vue
+++ b/src/views/enm_pack/power.vue
@@ -17,9 +17,11 @@
         </el-header>
         <el-card style="margin-top:5px">
             <div ref="print" id="myReport" class="printContainer">
-                <h3 style="text-align: center;">主要设备（100KW以上）单位产品电耗数据表</h3>
-                <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable">
-                    <thead style="background: #efefef;height: 40px;">
+                <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
+                    <thead class="myTableHead">
+                        <tr>
+                            <th colspan="6">水泥包装工段主要设备（100KW以上）单位产品电耗数据表</th>
+                        </tr>
                         <tr>
                             <th>设备名称</th>
                             <th>设备编号</th>
@@ -34,9 +36,9 @@
                             <td class="numCell">{{item.name}}</td>
                             <td class="numCell">{{item.number}}</td>
                             <td class="numCell">{{item.unit}}</td>
-                            <td class="numCell hoursItem" @click="itemClick('hours',item)" style="background: rgba(238, 179, 179, 0.8);">{{item.hours}}</td>
-                            <td class="numCell monthItem" @click="itemClick('month',item)" style="background: rgba(238, 189, 124, 0.8);">{{item.days}}</td>
-                            <td class="numCell yearItem" @click="itemClick1('year',item)" style="background: rgba(186, 236, 135, 0.8);">{{item.month}}</td>
+                            <td class="numCell hoursItem" @click="itemClick('hours',item)">{{item.hours}}</td>
+                            <td class="numCell monthItem" @click="itemClick('month',item)">{{item.days}}</td>
+                            <td class="numCell yearItem" @click="itemClick1('year',item)">{{item.month}}</td>
                         </tr>
                     </tbody>
                 </table>
@@ -182,30 +184,4 @@
     .printContainer{
         width: 1075px;
     }
-    #numTable{
-        margin-left: 37px;
-    }
-    #numTable td{
-        height: 32px;
-        padding-left: 5px;
-    }
-    .numCell{
-        width: 80px;
-        height: 35px;
-    }
-    .numCell.numCell_last{
-        width: 100px;
-    }
-    .searchHead{
-        display:flex
-    }
-    .middleText{
-        height: 32px;
-        line-height: 32px;
-        margin: 0 5px;
-        display: inline-block;
-    }
-    .searchBtn{
-        margin-left: 5px;
-    }
 </style>
\ No newline at end of file
diff --git a/src/views/enm_pack/quastat_form.vue b/src/views/enm_pack/quastat_form.vue
deleted file mode 100644
index 0ee0861d..00000000
--- a/src/views/enm_pack/quastat_form.vue
+++ /dev/null
@@ -1,253 +0,0 @@
-<template>
-    <el-dialog
-      :title="titleMap[mode]"
-      v-model="visible"
-      :size="1000"
-      destroy-on-close
-      id="bigDialog"
-      class="bigDialog"
-      @closed="$emit('closed')"
-    >
-      <el-container v-loading="loading">
-        <el-main style="padding: 0 20px 20px 20px">
-          <el-form
-          ref="dialogForm"
-          :model="form"
-          label-width="85px"
-          label-position="right"
-          :rules="rule1"
-        >
-          <el-row>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="关联工段">
-                <el-input v-model="form.mgroup_name" placeholder="关联工段" disabled/>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="当前班次">
-                <el-input v-model="form.shift_name" placeholder="当前班次" disabled/>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="当前班组">
-                <el-input v-model="form.team_name" placeholder="当前班组" disabled/>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="班组组长">
-                <el-input v-model="form.team_name" placeholder="班组组长" disabled/>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="开始时间">
-                <el-input v-model="form.start_time" placeholder="开始时间" disabled/>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="结束时间">
-                <el-input v-model="form.end_time" placeholder="结束时间" disabled/>
-              </el-form-item>
-            </el-col>
-            <el-divider />
-          </el-row>
-          
-          <!-- <el-row>
-            <el-col :lg="8" :md="12">
-              <el-form-item label="关联产物" prop="material">
-                <el-select
-                  v-model="form.material"
-                  placeholder="关联产物"
-                  clearable
-                  style="width: 100%;"
-                >
-                  <el-option
-                  v-for="item in teamOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :lg="8" :md="12">
-              <el-form-item label="质检项目" prop="testitem">
-                <el-select
-                  v-model="form.testitem"
-                  placeholder="质检项目"
-                  clearable
-                  style="width: 100%;"
-                >
-                  <el-option
-                  v-for="item in teamOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :lg="8" :md="12">
-              <el-form-item label="平均值" prop="team">
-                <el-input v-model="form.number" placeholder="平均值" />
-              </el-form-item>
-            </el-col>
-            <el-col :lg="8" :md="12">
-              <el-form-item label="检验次数" prop="mgroup">
-                <el-input v-model="form.number" placeholder="检验次数"/>
-              </el-form-item>
-            </el-col>
-            <el-col :lg="8" :md="12">
-              <el-form-item label="合格次数" prop="number">
-                <el-input v-model="form.number" placeholder="合格次数"/>
-              </el-form-item>
-            </el-col>
-            
-            <el-divider />
-          </el-row> -->
-        </el-form>
-        <sc-form-table
-          v-model="form.list"
-          :addTemplate="addTemplate"
-          placeholder="暂无数据"
-        >
-          <el-table-column prop="material" label="关联产物" min-width="150">
-            <template #default="scope">
-              <span v-if="scope.row.id">{{ scope.row.material_name }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="testitem" label="质检项目" min-width="150">
-            <template #default="scope">
-              <span v-if="scope.row.id">{{ scope.row.testitem_name }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="val_avg" label="平均值" min-width="150">
-            <template #default="scope">
-              <el-input
-                v-model="scope.row.val_avg"
-                placeholder="请输入内容"
-              ></el-input>
-            </template>
-          </el-table-column>
-          <el-table-column prop="num_test" label="检验次数" min-width="150">
-            <template #default="scope">
-              <el-input
-                v-model="scope.row.num_test"
-                placeholder="请输入内容"
-              ></el-input>
-            </template>
-          </el-table-column>
-          <el-table-column prop="num_ok" label="合格次数" min-width="150">
-            <template #default="scope">
-              <el-input
-                v-model="scope.row.num_ok"
-                placeholder="请输入内容"
-              ></el-input>
-            </template>
-          </el-table-column>
-        </sc-form-table>
-        </el-main>
-        <el-footer>
-          <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
-          <el-button @click="visible = false">取消</el-button>
-        </el-footer>
-      </el-container>
-    </el-dialog>
-  </template>
-  
-  <script>
-  export default {
-    emits: ["success", "closed"],
-    data() {
-      return {
-        addTemplate: {
-          material: "",
-          testitem: "",
-          val_avg: "",
-          num_test: "",
-          num_ok: "",
-        },
-        loading: false,
-        mode: "add",
-        titleMap: {
-          add: "质量检验",
-          edit: "质量检验",
-          show: "质量检验",
-        },
-        form: {
-          type:10,
-          list:[]
-        },
-        rules: {
-            name: [{required: true, message: "请输入", trigger: "blur"}],
-            number: [{required: true, message: "请输入", trigger: "blur"}],
-            keeper_name: [{required: true, message: "请输入", trigger: "blur"}],
-            belong_dept: [{required: true, message: "请选择", trigger: "blur"}]
-          },
-        visible: false,
-        isSaveing: false,
-        keeperOptions: [],
-        depOptions: [],
-        selectionFilters: [],
-        setFiltersVisible: false,
-        teamOptions:[],
-        shiftOptions:[],
-      };
-    },
-    mounted() {
-      //是否已经保存过
-      //若新增，调用init接口，若编辑修改，调get接口
-    },
-    methods: {
-      
-      //显示
-      open(mode = "add") {
-        this.mode = mode;
-        this.visible = true;
-        return this;
-      },
-      getReceptionist(data) {
-        this.form.leader=data.id;
-        this.form.leader_name=data.name
-      },
-      //表单提交方法
-      submit() {
-        this.isSaveing = true;
-            this.$API.qm.updateQuastat.req('bulk',this.form.list).then(res=>{
-              this.isSaveing = false;
-              this.$emit("success", this.form, this.mode);
-              this.visible = false;
-              this.$message.success("操作成功");
-            }).catch(res=>{
-              this.isSaveing = false;
-            })
-        // this.$refs.dialogForm.validate(async (valid) => {
-        //   if (valid) {
-           
-        //   }
-        // });
-      },
-      //表单注入数据
-      setData(data) {
-        Object.assign(this.form,data);
-        this.getsflogItem(this.form.id);
-      },
-      getsflogItem(id){
-        this.$API.wpm.sflog.init_test.req(id).then(res=>{
-          this.form.list = res;
-        })
-      },
-      //设置过滤项
-      setFilters(filters) {
-        this.selectionFilters = filters;
-        this.setFiltersVisible = true;
-      },
-    },
-  };
-  </script>
-  
-  <style scoped>
-  #bigDialog{
-    width: 90%;
-  }
-  </style>
-  
\ No newline at end of file
diff --git a/src/views/enm_pack/report.vue b/src/views/enm_pack/report.vue
index 29541679..a815fde4 100644
--- a/src/views/enm_pack/report.vue
+++ b/src/views/enm_pack/report.vue
@@ -17,9 +17,11 @@
         </el-header>
     <el-card style="margin-top:5px">
         <div ref="print" id="myReport" class="printContainer">
-            <h3 style="text-align: center;">生产报告</h3>
-            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable">
-                <thead style="background: #efefef;height: 40px;">
+            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
+                <thead class="myTableHead">
+                    <tr>
+                        <th colspan="10">水泥包装工段生产报告</th>
+                    </tr>
                     <tr>
                         <th colspan="2">参数</th>
                         <th>上个小时</th>
@@ -36,10 +38,10 @@
                     <tr v-for="(item) in tableDatas" :key="item">
                         <td class="numCell">{{item[0]}}</td>
                         <td class="numCell">{{item[1]}}</td>
-                        <td class="numCell hoursItem" @click="itemClick('hours',item)" style="background: rgba(238, 179, 179, 0.8);">{{item[2]}}</td>
-                        <td class="numCell daysItem" @click="itemClick('days',item)" style="background: rgba(239, 90, 90, 0.8);">{{item[3]}}</td>
-                        <td class="numCell monthItem" @click="itemClick('month',item)" style="background: rgba(238, 189, 124, 0.8);">{{item[4]}}</td>
-                        <td class="numCell yearItem" @click="itemClick1('year',item)" style="background: rgba(186, 236, 135, 0.8);">{{item[5]}}</td>
+                        <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">{{item[6]}}</td>
                         <td class="numCell">{{item[7]}}</td>
                         <td class="numCell">{{item[8]}}</td>
@@ -209,31 +211,5 @@
     .printContainer{
         width: 1075px;
     }
-    #numTable{
-        margin-left: 37px;
-    }
-    #numTable td{
-        height: 32px;
-        padding-left: 5px;
-    }
-    .numCell{
-        width: 80px;
-        height: 35px;
-        text-align: center;
-    }
-    .numCell.numCell_last{
-        width: 100px;
-    }
-    .searchHead{
-        display:flex
-    }
-    .middleText{
-        height: 32px;
-        line-height: 32px;
-        margin: 0 5px;
-        display: inline-block;
-    }
-    .searchBtn{
-        margin-left: 5px;
-    }
+
 </style>
\ No newline at end of file
diff --git a/src/views/enm_pack/teamAnalysis.vue b/src/views/enm_pack/teamAnalysis.vue
index 1d5863b2..416d0c82 100644
--- a/src/views/enm_pack/teamAnalysis.vue
+++ b/src/views/enm_pack/teamAnalysis.vue
@@ -36,9 +36,11 @@
         </el-header>
         <el-card style="margin-top:5px">
             <div ref="print" id="myReport" class="printContainer">
-                <h3 style="text-align: center;">主要设备（100KW以上）单位产品电耗数据表</h3>
-                <table border="1"  cellspacing="0" :key="timeStamp" id="myTable">
-                    <thead style="background: #efefef;height: 40px;">
+                <table border="1"  cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
+                    <thead class="myTableHead">
+                        <tr>
+                            <th colspan="10">电水泥包装工段班组月度对比分析</th>
+                        </tr>
                         <tr>
                             <th>月份</th>
                             <th>班组</th>
@@ -127,29 +129,4 @@
     .printContainer{
         width: 1075px;
     }
-    #numTable{
-        margin-left: 37px;
-    }
-    #numTable td{
-        height: 32px;
-        padding-left: 5px;
-    }
-    .numCell{
-        width: 80px;
-    }
-    .numCell.numCell_last{
-        width: 100px;
-    }
-    .searchHead{
-        display:flex
-    }
-    .middleText{
-        height: 32px;
-        line-height: 32px;
-        margin: 0 5px;
-        display: inline-block;
-    }
-    .searchBtn{
-        margin-left: 5px;
-    }
 </style>
\ No newline at end of file
diff --git a/src/views/enm_pack/workshopAnalysis.vue b/src/views/enm_pack/workshopAnalysis.vue
index 7df8e93f..5308db59 100644
--- a/src/views/enm_pack/workshopAnalysis.vue
+++ b/src/views/enm_pack/workshopAnalysis.vue
@@ -31,9 +31,11 @@
       </el-header>
     <el-card style="margin-top:5px">
         <div ref="print" id="myReport" class="printContainer">
-            <h3 style="text-align: center;">车间单位产品电耗月度分析表</h3>
-            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable">
-                <thead style="background: #efefef;height: 40px;">
+            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
+                <thead class="myTableHead">
+                    <tr>
+                        <th colspan="8">水泥包装工段车间单位产品电耗月度分析表</th>
+                    </tr>
                     <tr>
                         <th>月份</th>
                         <th>当期值（KW·h/t）</th>
@@ -131,29 +133,4 @@
     .printContainer{
         width: 1075px;
     }
-    #numTable{
-        margin-left: 37px;
-    }
-    #numTable td{
-        height: 32px;
-        padding-left: 5px;
-    }
-    .numCell{
-        width: 80px;
-    }
-    .numCell.numCell_last{
-        width: 100px;
-    }
-    .searchHead{
-        display:flex
-    }
-    .middleText{
-        height: 32px;
-        line-height: 32px;
-        margin: 0 5px;
-        display: inline-block;
-    }
-    .searchBtn{
-        margin-left: 5px;
-    }
 </style>
\ No newline at end of file
diff --git a/src/views/enm_rm/power.vue b/src/views/enm_rm/power.vue
index a7c52dcc..ab538c0d 100644
--- a/src/views/enm_rm/power.vue
+++ b/src/views/enm_rm/power.vue
@@ -17,9 +17,11 @@
         </el-header>
         <el-card style="margin-top:5px">
             <div ref="print" id="myReport" class="printContainer">
-                <h3 style="text-align: center;">主要设备（100KW以上）单位产品电耗数据表</h3>
-                <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable">
-                    <thead style="background: #efefef;height: 40px;">
+                <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
+                    <thead class="myTableHead">
+                        <tr>
+                            <th colspan="10">原料磨工段主要设备（100KW以上）单位产品电耗数据表</th>
+                        </tr>
                         <tr>
                             <th>设备名称</th>
                             <th>设备编号</th>
@@ -34,9 +36,9 @@
                             <td class="numCell">{{item.name}}</td>
                             <td class="numCell">{{item.number}}</td>
                             <td class="numCell">{{item.unit}}</td>
-                            <td class="numCell hoursItem" @click="itemClick('hours',item)" style="background: rgba(238, 179, 179, 0.8);">{{item[0]}}</td>
-                            <td class="numCell monthItem" @click="itemClick('month',item)" style="background: rgba(238, 189, 124, 0.8);">{{item[2]}}</td>
-                            <td class="numCell yearItem" @click="itemClick1('year',item)" style="background: rgba(186, 236, 135, 0.8);">{{item[3]}}</td>
+                            <td class="numCell hoursItem" @click="itemClick('hours',item)">{{item[0]}}</td>
+                            <td class="numCell monthItem" @click="itemClick('month',item)">{{item[2]}}</td>
+                            <td class="numCell yearItem" @click="itemClick1('year',item)">{{item[3]}}</td>
                         </tr>
                     </tbody>
                 </table>
@@ -187,30 +189,4 @@
     .printContainer{
         width: 1075px;
     }
-    #numTable{
-        margin-left: 37px;
-    }
-    #numTable td{
-        height: 32px;
-        padding-left: 5px;
-    }
-    .numCell{
-        width: 80px;
-        height: 35px;
-    }
-    .numCell.numCell_last{
-        width: 100px;
-    }
-    .searchHead{
-        display:flex
-    }
-    .middleText{
-        height: 32px;
-        line-height: 32px;
-        margin: 0 5px;
-        display: inline-block;
-    }
-    .searchBtn{
-        margin-left: 5px;
-    }
 </style>
\ No newline at end of file
diff --git a/src/views/enm_rm/quastat_form.vue b/src/views/enm_rm/quastat_form.vue
index 0ee0861d..8587d8a3 100644
--- a/src/views/enm_rm/quastat_form.vue
+++ b/src/views/enm_rm/quastat_form.vue
@@ -50,64 +50,12 @@
             </el-col>
             <el-divider />
           </el-row>
-          
-          <!-- <el-row>
-            <el-col :lg="8" :md="12">
-              <el-form-item label="关联产物" prop="material">
-                <el-select
-                  v-model="form.material"
-                  placeholder="关联产物"
-                  clearable
-                  style="width: 100%;"
-                >
-                  <el-option
-                  v-for="item in teamOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :lg="8" :md="12">
-              <el-form-item label="质检项目" prop="testitem">
-                <el-select
-                  v-model="form.testitem"
-                  placeholder="质检项目"
-                  clearable
-                  style="width: 100%;"
-                >
-                  <el-option
-                  v-for="item in teamOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :lg="8" :md="12">
-              <el-form-item label="平均值" prop="team">
-                <el-input v-model="form.number" placeholder="平均值" />
-              </el-form-item>
-            </el-col>
-            <el-col :lg="8" :md="12">
-              <el-form-item label="检验次数" prop="mgroup">
-                <el-input v-model="form.number" placeholder="检验次数"/>
-              </el-form-item>
-            </el-col>
-            <el-col :lg="8" :md="12">
-              <el-form-item label="合格次数" prop="number">
-                <el-input v-model="form.number" placeholder="合格次数"/>
-              </el-form-item>
-            </el-col>
-            
-            <el-divider />
-          </el-row> -->
         </el-form>
         <sc-form-table
           v-model="form.list"
           :addTemplate="addTemplate"
+          :hideAdd="hideAdd"
+          :hideDelete="hideDelete"
           placeholder="暂无数据"
         >
           <el-table-column prop="material" label="关联产物" min-width="150">
@@ -166,6 +114,8 @@
           num_test: "",
           num_ok: "",
         },
+        hideAdd:true,
+        hideDelete:true,
         loading: false,
         mode: "add",
         titleMap: {
diff --git a/src/views/enm_rm/report.vue b/src/views/enm_rm/report.vue
index 7ea71e46..5cc295d8 100644
--- a/src/views/enm_rm/report.vue
+++ b/src/views/enm_rm/report.vue
@@ -17,9 +17,11 @@
         </el-header>
     <el-card style="margin-top:5px">
         <div ref="print" id="myReport" class="printContainer">
-            <h3 style="text-align: center;">生产报告</h3>
-            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable">
-                <thead style="background: #efefef;height: 40px;">
+            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
+                <thead class="myTableHead">
+                    <tr>
+                        <th colspan="10">原料磨工段生产报告</th>
+                    </tr>
                     <tr>
                         <th colspan="2">参数</th>
                         <th>上个小时</th>
@@ -37,10 +39,10 @@
                         <td class="numCell" v-if="index==0||index==2" rowspan="2">{{item[0]}}</td>
                         <td class="numCell" v-if="index==4||index==5">{{item[0]}}</td>
                         <td class="numCell">{{item[1]}}</td>
-                        <td class="numCell hoursItem" @click="itemClick('hours',item)" style="background: rgba(238, 179, 179, 0.8);">{{item[2]}}</td>
-                        <td class="numCell daysItem" @click="itemClick('days',item)" style="background: rgba(239, 90, 90, 0.8);">{{item[3]}}</td>
-                        <td class="numCell monthItem" @click="itemClick('month',item)" style="background: rgba(238, 189, 124, 0.8);">{{item[4]}}</td>
-                        <td class="numCell yearItem" @click="itemClick1('year',item)" style="background: rgba(186, 236, 135, 0.8);">{{item[5]}}</td>
+                        <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">{{item[6]}}</td>
                         <td class="numCell">{{item[7]}}</td>
                         <td class="numCell">{{item[8]}}</td>
@@ -214,30 +216,4 @@
     .printContainer{
         width: 1075px;
     }
-    #numTable{
-        margin-left: 37px;
-    }
-    #numTable td{
-        height: 32px;
-        padding-left: 5px;
-    }
-    .numCell{
-        width: 80px;
-        height: 35px;
-    }
-    .numCell.numCell_last{
-        width: 100px;
-    }
-    .searchHead{
-        display:flex
-    }
-    .middleText{
-        height: 32px;
-        line-height: 32px;
-        margin: 0 5px;
-        display: inline-block;
-    }
-    .searchBtn{
-        margin-left: 5px;
-    }
 </style>
\ No newline at end of file
diff --git a/src/views/enm_rm/teamAnalysis.vue b/src/views/enm_rm/teamAnalysis.vue
index 34f02a57..e46b9451 100644
--- a/src/views/enm_rm/teamAnalysis.vue
+++ b/src/views/enm_rm/teamAnalysis.vue
@@ -36,9 +36,11 @@
         </el-header>
         <el-card style="margin-top:5px">
             <div ref="print" id="myReport" class="printContainer">
-                <h3 style="text-align: center;">主要设备（100KW以上）单位产品电耗数据表</h3>
-                <table border="1"  cellspacing="0" :key="timeStamp" id="myTable">
-                    <thead style="background: #efefef;height: 40px;">
+                <table border="1"  cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
+                    <thead class="myTableHead">
+                        <tr>
+                            <th colspan="19">原料磨工段班组月度对比分析</th>
+                        </tr>
                         <tr>
                             <th rowspan="2">月份</th>
                             <th rowspan="2">班组</th>
@@ -148,29 +150,4 @@
     .printContainer{
         width: 1075px;
     }
-    #numTable{
-        margin-left: 37px;
-    }
-    #numTable td{
-        height: 32px;
-        padding-left: 5px;
-    }
-    .numCell{
-        width: 80px;
-    }
-    .numCell.numCell_last{
-        width: 100px;
-    }
-    .searchHead{
-        display:flex
-    }
-    .middleText{
-        height: 32px;
-        line-height: 32px;
-        margin: 0 5px;
-        display: inline-block;
-    }
-    .searchBtn{
-        margin-left: 5px;
-    }
 </style>
\ No newline at end of file
diff --git a/src/views/enm_rm/workshopAnalysis.vue b/src/views/enm_rm/workshopAnalysis.vue
index 7df8e93f..2d3dc457 100644
--- a/src/views/enm_rm/workshopAnalysis.vue
+++ b/src/views/enm_rm/workshopAnalysis.vue
@@ -31,9 +31,11 @@
       </el-header>
     <el-card style="margin-top:5px">
         <div ref="print" id="myReport" class="printContainer">
-            <h3 style="text-align: center;">车间单位产品电耗月度分析表</h3>
-            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable">
-                <thead style="background: #efefef;height: 40px;">
+            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
+                <thead class="myTableHead">
+                    <tr>
+                        <th colspan="10">原料磨工段车间单位产品电耗月度分析表</th>
+                    </tr>
                     <tr>
                         <th>月份</th>
                         <th>当期值（KW·h/t）</th>
@@ -131,29 +133,4 @@
     .printContainer{
         width: 1075px;
     }
-    #numTable{
-        margin-left: 37px;
-    }
-    #numTable td{
-        height: 32px;
-        padding-left: 5px;
-    }
-    .numCell{
-        width: 80px;
-    }
-    .numCell.numCell_last{
-        width: 100px;
-    }
-    .searchHead{
-        display:flex
-    }
-    .middleText{
-        height: 32px;
-        line-height: 32px;
-        margin: 0 5px;
-        display: inline-block;
-    }
-    .searchBtn{
-        margin-left: 5px;
-    }
 </style>
\ No newline at end of file
diff --git a/src/views/enm_slag/handoverLog.vue b/src/views/enm_slag/handoverLog.vue
index f805e1d8..4257c66a 100644
--- a/src/views/enm_slag/handoverLog.vue
+++ b/src/views/enm_slag/handoverLog.vue
@@ -74,11 +74,11 @@
                         <span v-if="scope.row.last_test_time">{{ scope.row.last_test_time.slice(0,16)}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="操作" fixed="right" align="center" width="100">
+                <el-table-column label="操作" fixed="right" align="center" width="150">
                   <template #default="scope">
                     <el-button link size="small" @click="sflog_edit(scope.row)" type="primary">编辑</el-button>
                     <!-- <el-button link size="small" @click="sflog_check(scope.row)" type="primary">质量检验</el-button> -->
-                    <!-- <el-button link size="small" @click="sflog_other(scope.row)" type="primary">其他能源</el-button> -->
+                    <el-button link size="small" @click="sflog_other(scope.row)" type="primary">其他能源</el-button>
                     <el-button link size="small" @click="sflog_export(scope.row)" type="success">报表</el-button>
                   </template>
                 </el-table-column>
@@ -130,13 +130,20 @@
       @success="handleSaveSuccess"
       @closed="dialog.save = false"
     ></save-dialog>
+    <other-dialog
+      v-if="dialog.other"
+      ref="otherDialog"
+      @success="handleOtherSuccess"
+      @closed="dialog.other = false"
+    ></other-dialog>
   </template>
   <script>
-import saveDialog from "./handover_form.vue";
+  import otherDialog from "./../enm_rm/other_form.vue";
+  import saveDialog from "./../enm_rm/handover_form.vue";
   export default {
     name: "listSon",
     components: {
-        saveDialog,
+        saveDialog,otherDialog
     },
     data() {
       return {
@@ -148,6 +155,7 @@ import saveDialog from "./handover_form.vue";
         query2: {},
         dialog: {
           save: false,
+          other:false
         },
         sflogItem:{},
         selection: [],
@@ -179,7 +187,13 @@ import saveDialog from "./handover_form.vue";
             this.$refs.saveDialog.open("edit").setData(row);
         });
       },
-     
+     //其他能源物料
+     sflog_other(row){
+        this.dialog.other = true;
+        this.$nextTick(() => {
+            this.$refs.otherDialog.open("edit").setData(row);
+        });
+      },
       //删除
       async table_del(row) {
         this.$API.wpm.sflog.delete.req(row.id)
@@ -199,9 +213,6 @@ import saveDialog from "./handover_form.vue";
       handleOtherSuccess(){
         this.dialog.other = false;
       },
-      handleCheckSuccess(){
-        this.dialog.check = false;
-      },
       closed() {
         this.dialog.save = false;
         this.$refs.table2.refresh();
diff --git a/src/views/enm_slag/handover_form.vue b/src/views/enm_slag/handover_form.vue
deleted file mode 100644
index 708fb3d3..00000000
--- a/src/views/enm_slag/handover_form.vue
+++ /dev/null
@@ -1,198 +0,0 @@
-<template>
-    <el-dialog
-      :title="titleMap[mode]"
-      v-model="visible"
-      :size="1000"
-      destroy-on-close
-      @closed="$emit('closed')"
-    >
-      <el-container v-loading="loading">
-        <el-main style="padding: 0 20px 20px 20px">
-          <el-form
-            ref="dialogForm"
-            :model="form"
-            label-width="100px"
-            label-position="right"
-            :rules="rule1"
-          >
-            <el-row>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="关联工段" prop="mgroup">
-                  <el-input v-model="form.mgroup_name" placeholder="关联工段" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="当班班次" prop="shift">
-                  <el-input v-model="form.shift_name" placeholder="当班班次" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="开始时间" prop="start_time">
-                  <el-date-picker
-                      disabled
-                      v-model="form.start_time"
-                      type="datetime"
-                      format="YYYY-MM-DD HH:mm"
-                      placeholder="基础月份"
-                      style="width: 100%;"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="结束时间" prop="end_time">
-                  <el-date-picker
-                      disabled
-                      v-model="form.end_time"
-                      type="datetime"
-                      format="YYYY-MM-DD HH:mm"
-                      placeholder="对比月份"
-                      style="width: 100%;"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="当班班组" prop="team">
-                  <el-select
-                    v-model="form.team"
-                    placeholder="当班班组"
-                    clearable
-                    style="width: 100%;"
-                    @change="teamChange"
-                  >
-                    <el-option
-                    v-for="item in teamOptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="班组班长" prop="leader_name">
-                  <el-input v-model="form.leader_name" placeholder="班组班长" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col>
-                <el-form-item label="生产情况记录">
-                    <el-input
-                      type="textarea"
-                      :rows="4"
-                      v-model="form.note"
-                      placeholder="生产情况记录"
-                    />
-                  </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </el-main>
-        <el-footer>
-          <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
-          <el-button @click="visible = false">取消</el-button>
-        </el-footer>
-      </el-container>
-    </el-dialog>
-  </template>
-  <script>
-  export default {
-    emits: ["success", "closed"],
-    data() {
-      return {
-        loading: false,
-        mode: "add",
-        titleMap: {
-          add: "交接班日志",
-          edit: "交接班日志",
-          show: "查看交接班日志",
-        },
-        form: {
-          type:10,
-        },
-        rules: {
-            name: [{required: true, message: "请输入", trigger: "blur"}],
-            number: [{required: true, message: "请输入", trigger: "blur"}],
-            keeper_name: [{required: true, message: "请输入", trigger: "blur"}],
-            belong_dept: [{required: true, message: "请选择", trigger: "blur"}]
-          },
-        visible: false,
-        isSaveing: false,
-        keeperOptions: [],
-        depOptions: [],
-        selectionFilters: [],
-        setFiltersVisible: false,
-        teamOptions:[],
-        shiftOptions:[],
-      };
-    },
-    mounted() {
-      //获取班组
-      this.getTeam();
-      this.getShfit();
-    },
-    methods: {
-      getTeam(){
-        this.$API.mtm.team.list.req({page:0}).then(res=>{
-          this.teamOptions = res;
-        })
-      },
-      getShfit(){
-        this.$API.mtm.shift.req({page:0}).then(res=>{
-          this.shiftOptions = res;
-        })
-      },
-      //显示
-      open(mode = "add") {
-        this.mode = mode;
-        this.visible = true;
-        return this;
-      },
-      teamChange(data){
-        let that = this;
-        that.teamOptions.forEach(item=>{
-          if(item.id==data){
-            that.form.leader_name = item.leader_name;
-            that.form.leader= item.leader;
-          }
-        })
-      },
-      //表单提交方法
-      submit() {
-        this.$refs.dialogForm.validate(async (valid) => {
-          if (valid) {
-            this.isSaveing = true;
-            try {
-              let obj={};
-              obj.note = this.form.note;
-              obj.team = this.form.team;
-              obj.shift = this.form.shift;
-              obj.leader = this.form.leader;
-              this.$API.wpm.sflog.update.req(this.form.id,obj).then(res=>{
-                this.isSaveing = false;
-                this.$emit("success", this.form, this.mode);
-                this.visible = false;
-                this.$message.success("操作成功");
-                return res;
-              })
-            } catch (err) {
-              //可以处理校验错误
-              this.isSaveing = false;
-              return err;
-            }
-          }
-        });
-      },
-      //表单注入数据
-      setData(data) {
-        Object.assign(this.form,data);
-      },
-      //设置过滤项
-      setFilters(filters) {
-        this.selectionFilters = filters;
-        this.setFiltersVisible = true;
-      },
-    },
-  };
-  </script>
-  <style>
-  </style>
-  
\ No newline at end of file
diff --git a/src/views/enm_slag/other_form.vue b/src/views/enm_slag/other_form.vue
deleted file mode 100644
index 5706486f..00000000
--- a/src/views/enm_slag/other_form.vue
+++ /dev/null
@@ -1,189 +0,0 @@
-<template>
-    <el-dialog
-      :title="titleMap[mode]"
-      v-model="visible"
-      :size="1000"
-      destroy-on-close
-      @closed="$emit('closed')"
-    >
-      <el-container v-loading="loading">
-        <el-main style="padding: 0 20px 20px 20px">
-          <el-form
-            ref="dialogForm"
-            :model="form"
-            label-width="100px"
-            label-position="right"
-            :rules="rules"
-          >
-            <el-row>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="关联工段" prop="mgroup">
-                  <el-input v-model="form.mgroup_name" placeholder="关联工段" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="当班班次">
-                  <el-input v-model="form.shift_name" placeholder="当班班次" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="开始时间" prop="start_time">
-                  <el-input v-model="form.start_time" placeholder="结束时间" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="结束时间" prop="end_time">
-                  <el-input v-model="form.end_time" placeholder="结束时间" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="当班班组" prop="team">
-                  <el-input v-model="form.team_name" placeholder="班组班长" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="班组班长" prop="leader_name">
-                  <el-input v-model="form.leader_name" placeholder="班组班长" disabled/>
-                </el-form-item>
-              </el-col>
-              <el-col :md="12" :sm="24">
-                <el-form-item label="检测时间" prop="time">
-                  <el-date-picker
-                    v-model="form.time"
-                    type="datetime"
-                    value-format="YYYY-MM-DD HH:mm"
-                    format="YYYY-MM-DD HH:mm"
-                    placeholder="检测时间"
-                />
-                </el-form-item>
-              </el-col>
-              <el-col  :md="12" :sm="24" class="formUnitWrap">
-                <el-form-item label="水耗统计" prop="val">
-                    <el-input-number v-model="form.val" :precision="2" controls-position="right" placeholder="水耗统计" style="width: 100%;"></el-input-number>
-                  </el-form-item>
-                  <span class="formUnit">(t)</span>
-              </el-col>
-            </el-row>
-          </el-form>
-        </el-main>
-        <el-footer>
-          <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
-          <el-button @click="visible = false">取消</el-button>
-        </el-footer>
-      </el-container>
-    </el-dialog>
-  </template>
-  <script>
-  export default {
-    emits: ["success", "closed"],
-    data() {
-      return {
-        loading: false,
-        mode: "add",
-        titleMap: {
-          add: "其他能源录入",
-          edit: "其他能源录入",
-          show: "其他能源录入",
-        },
-        form: {
-          type:10,
-        },
-        rules: {
-            val: [{required: true, message: "请输入检测值", trigger: "blur"}],
-            time: [{required: true, message: "请选择检测时间", trigger: "blur"}]
-          },
-        visible: false,
-        isSaveing: false,
-        keeperOptions: [],
-        depOptions: [],
-        selectionFilters: [],
-        setFiltersVisible: false,
-        teamOptions:[],
-        shiftOptions:[],
-      };
-    },
-    mounted() {
-      //获取班组
-      this.getTeam();
-      this.getShfit();
-    },
-    methods: {
-      getTeam(){
-        this.$API.mtm.team.list.req({page:0}).then(res=>{
-          this.teamOptions = res;
-        })
-      },
-      getShfit(){
-        this.$API.mtm.shift.req({page:0}).then(res=>{
-          this.shiftOptions = res;
-        })
-      },
-      //显示
-      open(mode = "add") {
-        this.mode = mode;
-        this.visible = true;
-        return this;
-      },
-      teamChange(data){
-        let that = this;
-        that.teamOptions.forEach(item=>{
-          if(item.id==data){
-            that.form.leader_name = item.leader_name;
-            that.form.leader= item.leader;
-          }
-        })
-      },
-      //表单提交方法
-      submit() {
-        this.$refs.dialogForm.validate(async (valid) => {
-          if (valid) {
-            this.isSaveing = true;
-            try {
-              let obj={};
-              debugger;
-              obj.year_s = this.form.time.slice(0,4);
-              obj.month_s = this.form.time.slice(5,7);
-              obj.day_s = this.form.time.slice(8,10);
-              obj.hour = this.form.time.slice(11,13);
-              obj.val = this.form.val;
-              obj.sflog = this.form.id;
-              obj.material = '3349350755361792000';
-              obj.mpoint = '3349214860667219968';
-              this.$API.enm.mpoint.statCreate.req(obj).then(res=>{
-                this.isSaveing = false;
-                this.$emit("success", this.form, this.mode);
-                this.visible = false;
-                this.$message.success("操作成功");
-                return res;
-              })
-            } catch (err) {
-              //可以处理校验错误
-              this.isSaveing = false;
-              return err;
-            }
-          }
-        });
-      },
-      //表单注入数据
-      setData(data) {
-        Object.assign(this.form,data);
-      },
-      //设置过滤项
-      setFilters(filters) {
-        this.selectionFilters = filters;
-        this.setFiltersVisible = true;
-      },
-    },
-  };
-  </script>
-  <style>
-  .formUnit{
-    position: absolute;
-    right: -17px;
-    top: 7px;
-  }
-  .formUnitWrap{
-    position: relative;
-  }
-  </style>
-  
\ No newline at end of file
diff --git a/src/views/enm_slag/power.vue b/src/views/enm_slag/power.vue
index 7015e353..8c2fed53 100644
--- a/src/views/enm_slag/power.vue
+++ b/src/views/enm_slag/power.vue
@@ -17,9 +17,11 @@
         </el-header>
         <el-card style="margin-top:5px">
             <div ref="print" id="myReport" class="printContainer">
-                <h3 style="text-align: center;">主要设备（100KW以上）单位产品电耗数据表</h3>
-                <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable">
-                    <thead style="background: #efefef;height: 40px;">
+                <table border="1" width="1000" cellspacing="0" :key="timeStamp" class="myTable" id="myTable">
+                    <thead class="myTableHead">
+                        <tr>
+                            <th colspan="6">电石渣工段主要设备（100KW以上）单位产品电耗数据表</th>
+                        </tr>
                         <tr>
                             <th>设备名称</th>
                             <th>设备编号</th>
@@ -34,9 +36,9 @@
                             <td class="numCell">{{item.name}}</td>
                             <td class="numCell">{{item.number}}</td>
                             <td class="numCell">{{item.unit}}</td>
-                            <td class="numCell hoursItem" @click="itemClick('hours',item)" style="background: rgba(238, 179, 179, 0.8);">{{item.hours}}</td>
-                            <td class="numCell monthItem" @click="itemClick('month',item)" style="background: rgba(238, 189, 124, 0.8);">{{item.days}}</td>
-                            <td class="numCell yearItem" @click="itemClick1('year',item)" style="background: rgba(186, 236, 135, 0.8);">{{item.month}}</td>
+                            <td class="numCell hoursItem" @click="itemClick('hours',item)">{{item.hours}}</td>
+                            <td class="numCell monthItem" @click="itemClick('month',item)">{{item.days}}</td>
+                            <td class="numCell yearItem" @click="itemClick1('year',item)">{{item.month}}</td>
                         </tr>
                     </tbody>
                 </table>
@@ -182,30 +184,4 @@
     .printContainer{
         width: 1075px;
     }
-    #numTable{
-        margin-left: 37px;
-    }
-    #numTable td{
-        height: 32px;
-        padding-left: 5px;
-    }
-    .numCell{
-        width: 80px;
-        height: 35px;
-    }
-    .numCell.numCell_last{
-        width: 100px;
-    }
-    .searchHead{
-        display:flex
-    }
-    .middleText{
-        height: 32px;
-        line-height: 32px;
-        margin: 0 5px;
-        display: inline-block;
-    }
-    .searchBtn{
-        margin-left: 5px;
-    }
 </style>
\ No newline at end of file
diff --git a/src/views/enm_slag/quastat_form.vue b/src/views/enm_slag/quastat_form.vue
deleted file mode 100644
index 0ee0861d..00000000
--- a/src/views/enm_slag/quastat_form.vue
+++ /dev/null
@@ -1,253 +0,0 @@
-<template>
-    <el-dialog
-      :title="titleMap[mode]"
-      v-model="visible"
-      :size="1000"
-      destroy-on-close
-      id="bigDialog"
-      class="bigDialog"
-      @closed="$emit('closed')"
-    >
-      <el-container v-loading="loading">
-        <el-main style="padding: 0 20px 20px 20px">
-          <el-form
-          ref="dialogForm"
-          :model="form"
-          label-width="85px"
-          label-position="right"
-          :rules="rule1"
-        >
-          <el-row>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="关联工段">
-                <el-input v-model="form.mgroup_name" placeholder="关联工段" disabled/>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="当前班次">
-                <el-input v-model="form.shift_name" placeholder="当前班次" disabled/>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="当前班组">
-                <el-input v-model="form.team_name" placeholder="当前班组" disabled/>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="班组组长">
-                <el-input v-model="form.team_name" placeholder="班组组长" disabled/>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="开始时间">
-                <el-input v-model="form.start_time" placeholder="开始时间" disabled/>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="结束时间">
-                <el-input v-model="form.end_time" placeholder="结束时间" disabled/>
-              </el-form-item>
-            </el-col>
-            <el-divider />
-          </el-row>
-          
-          <!-- <el-row>
-            <el-col :lg="8" :md="12">
-              <el-form-item label="关联产物" prop="material">
-                <el-select
-                  v-model="form.material"
-                  placeholder="关联产物"
-                  clearable
-                  style="width: 100%;"
-                >
-                  <el-option
-                  v-for="item in teamOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :lg="8" :md="12">
-              <el-form-item label="质检项目" prop="testitem">
-                <el-select
-                  v-model="form.testitem"
-                  placeholder="质检项目"
-                  clearable
-                  style="width: 100%;"
-                >
-                  <el-option
-                  v-for="item in teamOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :lg="8" :md="12">
-              <el-form-item label="平均值" prop="team">
-                <el-input v-model="form.number" placeholder="平均值" />
-              </el-form-item>
-            </el-col>
-            <el-col :lg="8" :md="12">
-              <el-form-item label="检验次数" prop="mgroup">
-                <el-input v-model="form.number" placeholder="检验次数"/>
-              </el-form-item>
-            </el-col>
-            <el-col :lg="8" :md="12">
-              <el-form-item label="合格次数" prop="number">
-                <el-input v-model="form.number" placeholder="合格次数"/>
-              </el-form-item>
-            </el-col>
-            
-            <el-divider />
-          </el-row> -->
-        </el-form>
-        <sc-form-table
-          v-model="form.list"
-          :addTemplate="addTemplate"
-          placeholder="暂无数据"
-        >
-          <el-table-column prop="material" label="关联产物" min-width="150">
-            <template #default="scope">
-              <span v-if="scope.row.id">{{ scope.row.material_name }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="testitem" label="质检项目" min-width="150">
-            <template #default="scope">
-              <span v-if="scope.row.id">{{ scope.row.testitem_name }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="val_avg" label="平均值" min-width="150">
-            <template #default="scope">
-              <el-input
-                v-model="scope.row.val_avg"
-                placeholder="请输入内容"
-              ></el-input>
-            </template>
-          </el-table-column>
-          <el-table-column prop="num_test" label="检验次数" min-width="150">
-            <template #default="scope">
-              <el-input
-                v-model="scope.row.num_test"
-                placeholder="请输入内容"
-              ></el-input>
-            </template>
-          </el-table-column>
-          <el-table-column prop="num_ok" label="合格次数" min-width="150">
-            <template #default="scope">
-              <el-input
-                v-model="scope.row.num_ok"
-                placeholder="请输入内容"
-              ></el-input>
-            </template>
-          </el-table-column>
-        </sc-form-table>
-        </el-main>
-        <el-footer>
-          <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
-          <el-button @click="visible = false">取消</el-button>
-        </el-footer>
-      </el-container>
-    </el-dialog>
-  </template>
-  
-  <script>
-  export default {
-    emits: ["success", "closed"],
-    data() {
-      return {
-        addTemplate: {
-          material: "",
-          testitem: "",
-          val_avg: "",
-          num_test: "",
-          num_ok: "",
-        },
-        loading: false,
-        mode: "add",
-        titleMap: {
-          add: "质量检验",
-          edit: "质量检验",
-          show: "质量检验",
-        },
-        form: {
-          type:10,
-          list:[]
-        },
-        rules: {
-            name: [{required: true, message: "请输入", trigger: "blur"}],
-            number: [{required: true, message: "请输入", trigger: "blur"}],
-            keeper_name: [{required: true, message: "请输入", trigger: "blur"}],
-            belong_dept: [{required: true, message: "请选择", trigger: "blur"}]
-          },
-        visible: false,
-        isSaveing: false,
-        keeperOptions: [],
-        depOptions: [],
-        selectionFilters: [],
-        setFiltersVisible: false,
-        teamOptions:[],
-        shiftOptions:[],
-      };
-    },
-    mounted() {
-      //是否已经保存过
-      //若新增，调用init接口，若编辑修改，调get接口
-    },
-    methods: {
-      
-      //显示
-      open(mode = "add") {
-        this.mode = mode;
-        this.visible = true;
-        return this;
-      },
-      getReceptionist(data) {
-        this.form.leader=data.id;
-        this.form.leader_name=data.name
-      },
-      //表单提交方法
-      submit() {
-        this.isSaveing = true;
-            this.$API.qm.updateQuastat.req('bulk',this.form.list).then(res=>{
-              this.isSaveing = false;
-              this.$emit("success", this.form, this.mode);
-              this.visible = false;
-              this.$message.success("操作成功");
-            }).catch(res=>{
-              this.isSaveing = false;
-            })
-        // this.$refs.dialogForm.validate(async (valid) => {
-        //   if (valid) {
-           
-        //   }
-        // });
-      },
-      //表单注入数据
-      setData(data) {
-        Object.assign(this.form,data);
-        this.getsflogItem(this.form.id);
-      },
-      getsflogItem(id){
-        this.$API.wpm.sflog.init_test.req(id).then(res=>{
-          this.form.list = res;
-        })
-      },
-      //设置过滤项
-      setFilters(filters) {
-        this.selectionFilters = filters;
-        this.setFiltersVisible = true;
-      },
-    },
-  };
-  </script>
-  
-  <style scoped>
-  #bigDialog{
-    width: 90%;
-  }
-  </style>
-  
\ No newline at end of file
diff --git a/src/views/enm_slag/report.vue b/src/views/enm_slag/report.vue
index 27d51b3e..d2243008 100644
--- a/src/views/enm_slag/report.vue
+++ b/src/views/enm_slag/report.vue
@@ -17,9 +17,11 @@
         </el-header>
     <el-card style="margin-top:5px">
         <div ref="print" id="myReport" class="printContainer">
-            <h3 style="text-align: center;">生产报告</h3>
-            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable">
-                <thead style="background: #efefef;height: 40px;">
+            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
+                <thead class="myTableHead">
+                    <tr>
+                        <th colspan="10">电石渣工段生产报告</th>
+                    </tr>
                     <tr>
                         <th colspan="2">参数</th>
                         <th>上个小时</th>
@@ -36,10 +38,10 @@
                     <tr v-for="(item) in tableDatas" :key="item">
                         <td class="numCell">{{item[0]}}</td>
                         <td class="numCell">{{item[1]}}</td>
-                        <td class="numCell hoursItem" @click="itemClick('hours',item)" style="background: rgba(238, 179, 179, 0.8);">{{item[2]}}</td>
-                        <td class="numCell daysItem" @click="itemClick('days',item)" style="background: rgba(239, 90, 90, 0.8);">{{item[3]}}</td>
-                        <td class="numCell monthItem" @click="itemClick('month',item)" style="background: rgba(238, 189, 124, 0.8);">{{item[4]}}</td>
-                        <td class="numCell yearItem" @click="itemClick1('year',item)" style="background: rgba(186, 236, 135, 0.8);">{{item[5]}}</td>
+                        <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">{{item[6]}}</td>
                         <td class="numCell">{{item[7]}}</td>
                         <td class="numCell">{{item[8]}}</td>
@@ -210,31 +212,4 @@
     .printContainer{
         width: 1075px;
     }
-    #numTable{
-        margin-left: 37px;
-    }
-    #numTable td{
-        height: 32px;
-        padding-left: 5px;
-    }
-    .numCell{
-        width: 80px;
-        height: 35px;
-        text-align: center;
-    }
-    .numCell.numCell_last{
-        width: 100px;
-    }
-    .searchHead{
-        display:flex
-    }
-    .middleText{
-        height: 32px;
-        line-height: 32px;
-        margin: 0 5px;
-        display: inline-block;
-    }
-    .searchBtn{
-        margin-left: 5px;
-    }
 </style>
\ No newline at end of file
diff --git a/src/views/enm_slag/teamAnalysis.vue b/src/views/enm_slag/teamAnalysis.vue
index 34f02a57..d3e78387 100644
--- a/src/views/enm_slag/teamAnalysis.vue
+++ b/src/views/enm_slag/teamAnalysis.vue
@@ -36,9 +36,11 @@
         </el-header>
         <el-card style="margin-top:5px">
             <div ref="print" id="myReport" class="printContainer">
-                <h3 style="text-align: center;">主要设备（100KW以上）单位产品电耗数据表</h3>
-                <table border="1"  cellspacing="0" :key="timeStamp" id="myTable">
-                    <thead style="background: #efefef;height: 40px;">
+                <table border="1"  cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
+                    <thead class="myTableHead">
+                        <tr>
+                            <th colspan="19">电石渣工段班组月度对比分析</th>
+                        </tr>
                         <tr>
                             <th rowspan="2">月份</th>
                             <th rowspan="2">班组</th>
@@ -148,29 +150,4 @@
     .printContainer{
         width: 1075px;
     }
-    #numTable{
-        margin-left: 37px;
-    }
-    #numTable td{
-        height: 32px;
-        padding-left: 5px;
-    }
-    .numCell{
-        width: 80px;
-    }
-    .numCell.numCell_last{
-        width: 100px;
-    }
-    .searchHead{
-        display:flex
-    }
-    .middleText{
-        height: 32px;
-        line-height: 32px;
-        margin: 0 5px;
-        display: inline-block;
-    }
-    .searchBtn{
-        margin-left: 5px;
-    }
 </style>
\ No newline at end of file
diff --git a/src/views/enm_slag/workshopAnalysis.vue b/src/views/enm_slag/workshopAnalysis.vue
index 7df8e93f..77c4cf06 100644
--- a/src/views/enm_slag/workshopAnalysis.vue
+++ b/src/views/enm_slag/workshopAnalysis.vue
@@ -31,9 +31,11 @@
       </el-header>
     <el-card style="margin-top:5px">
         <div ref="print" id="myReport" class="printContainer">
-            <h3 style="text-align: center;">车间单位产品电耗月度分析表</h3>
-            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable">
-                <thead style="background: #efefef;height: 40px;">
+            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
+                <thead class="myTableHead">
+                    <tr>
+                        <th colspan="8">车间单位产品电耗月度分析表</th>
+                    </tr>
                     <tr>
                         <th>月份</th>
                         <th>当期值（KW·h/t）</th>
@@ -131,29 +133,4 @@
     .printContainer{
         width: 1075px;
     }
-    #numTable{
-        margin-left: 37px;
-    }
-    #numTable td{
-        height: 32px;
-        padding-left: 5px;
-    }
-    .numCell{
-        width: 80px;
-    }
-    .numCell.numCell_last{
-        width: 100px;
-    }
-    .searchHead{
-        display:flex
-    }
-    .middleText{
-        height: 32px;
-        line-height: 32px;
-        margin: 0 5px;
-        display: inline-block;
-    }
-    .searchBtn{
-        margin-left: 5px;
-    }
 </style>
\ No newline at end of file
diff --git a/src/views/ungrouped/feeset.vue b/src/views/ungrouped/feeset.vue
index 10fc9ea0..e0b59e9e 100644
--- a/src/views/ungrouped/feeset.vue
+++ b/src/views/ungrouped/feeset.vue
@@ -52,7 +52,7 @@
 			
 		</el-header>
 		<el-main class="nopadding">
-			<scTable ref="table" :apiObj="apiObj" row-key="id"  hidePagination>
+			<scTable ref="table" :apiObj="apiObj" row-key="id">
 				<el-table-column label="#" type="index" width="50"></el-table-column>
 				<el-table-column label="年" prop="year" min-width="100"></el-table-column>
 				<el-table-column label="月" prop="month" min-width="100"></el-table-column>
diff --git a/src/views/ungrouped/priceset.vue b/src/views/ungrouped/priceset.vue
index 1a6eaec8..3289fc4e 100644
--- a/src/views/ungrouped/priceset.vue
+++ b/src/views/ungrouped/priceset.vue
@@ -31,7 +31,7 @@
 			
 		</el-header>
 		<el-main class="nopadding">
-			<scTable ref="table" :apiObj="apiObj" row-key="id"  hidePagination>
+			<scTable ref="table" :apiObj="apiObj" row-key="id">
 				<el-table-column label="#" type="index" width="50"></el-table-column>
 				<el-table-column label="年" prop="year" min-width="100"></el-table-column>
 				<el-table-column label="月" prop="month" min-width="100"></el-table-column>
diff --git a/src/views/ungrouped/quality.vue b/src/views/ungrouped/quality.vue
index 14256358..77628912 100644
--- a/src/views/ungrouped/quality.vue
+++ b/src/views/ungrouped/quality.vue
@@ -2,6 +2,19 @@
     <div class="app-container">
         <el-header>
             <div class="left-panel">
+                 <el-select
+                  v-model="query.mgroup"
+                  placeholder="工段"
+                  clearable
+                  style="margin-left: 2px; width: 200px"
+                >
+                  <el-option
+                  v-for="item in mgroupOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                  ></el-option>
+                </el-select>
                 <el-select
                     v-model="query.type"
                     placeholder="查询类型"
@@ -296,6 +309,7 @@
                     {id:1,name:'月报表'},
                     {id:2,name:'年报表'},
                 ],
+                mgroupOptions:[],
                 tableTime:'',
                 tableName:'质检日报表',
                 tableHead:['车间','物料','检验项目','平均值','检次','合次','合格率'],
@@ -347,9 +361,17 @@
             }
             this.query.day = myDate.getFullYear()+'-'+month+'-'+days;
             this.getTableData();
+            this.getMgroup();
 
         },
         methods: {
+            //获取工段列表
+            getMgroup(){
+                this.$API.mtm.mgroup.list.req({page:0}).then(res=>{
+                    this.mgroupOptions = res;
+                    this.query.mgroup = res[8].id
+                })
+            },
             typeCange(value){
                 if(value==1){
                     this.tableName = '质检日报表'