diff --git a/src/views/count/components/energyProcessing.vue b/src/views/count/components/energyProcessing.vue
index a653168..6e49692 100644
--- a/src/views/count/components/energyProcessing.vue
+++ b/src/views/count/components/energyProcessing.vue
@@ -1,15 +1,225 @@
 <!-- 能源加工转换 (选填) -->
 <script lang="ts" setup>
 // 表格数据
-const data: any = []
-const select: any = []
-// const localData = JSON.parse(sessionStorage.getItem('能源加工转换-table') as string || '')
-const tableData = ref(data)
+const data: any = [
+  {
+    type: '液化石油气',
+    consumption: '',
+    emissionsCO: '',
+    emissionFactorCO: '1',
+    emissionFactorCO_value: '',
+    emissionsCH: '',
+    emissionFactorCH: '1',
+    emissionFactorCH_value: '',
+    emissionsNO: '',
+    emissionFactorNO: '1',
+    emissionFactorNO_value: '',
+    outputMode: '转化', // 产出方式
+    outputType: '液化石油气', // 产出类型
+    // amount: '转化与回收量',
+  },
+  {
+    type: '液化石油气',
+    consumption: '',
+    emissionsCO: '',
+    emissionFactorCO: '1',
+    emissionFactorCO_value: '',
+    emissionsCH: '',
+    emissionFactorCH: '1',
+    emissionFactorCH_value: '',
+    emissionsNO: '',
+    emissionFactorNO: '1',
+    emissionFactorNO_value: '',
+    outputMode: '回收', // 产出方式
+    outputType: '液化石油气', // 产出类型
+    // amount: '转化与回收量',
+  },
+  {
+    type: '燃料油',
+    consumption: '',
+    emissionsCO: '',
+    emissionFactorCO: '1',
+    emissionFactorCO_value: '',
+    emissionsCH: '',
+    emissionFactorCH: '1',
+    emissionFactorCH_value: '',
+    emissionsNO: '',
+    emissionFactorNO: '1',
+    emissionFactorNO_value: '',
+    outputMode: '转化', // 产出方式
+    outputType: '燃料油', // 产出类型
+    // amount: '转化与回收量',
+  },
+  {
+    type: '燃料油',
+    consumption: '',
+    emissionsCO: '',
+    emissionFactorCO: '1',
+    emissionFactorCO_value: '',
+    emissionsCH: '',
+    emissionFactorCH: '1',
+    emissionFactorCH_value: '',
+    emissionsNO: '',
+    emissionFactorNO: '1',
+    emissionFactorNO_value: '',
+    outputMode: '回收', // 产出方式
+    outputType: '燃料油', // 产出类型
+    // amount: '转化与回收量',
+  },
+]
+const select: any = ['液化石油气', '燃料油']
+const localData = JSON.parse(sessionStorage.getItem('能源加工转换-table') as string)
+const tableData = ref(localData || data)
 const selectData = ref(select)
 const confirmArr = ref<string[]>([])
 const cancelArr = ref<string[]>([])
 // 计算参数
-const countParams = ref([])
+const countParams = ref([
+  {
+    type: '原煤',
+    CO: 1.981,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '洗精煤',
+    CO: 2.405,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '其他洗煤',
+    CO: 0.955,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '煤制品',
+    CO: 2.418,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '型煤',
+    CO: 1.950,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '水煤浆',
+    CO: 2.397,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '煤粉',
+    CO: 2.527,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '焦炭',
+    CO: 2.860,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '其他焦化产品',
+    CO: 3.833,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '焦炉煤气',
+    CO: 8.555,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '高炉煤气',
+    CO: 9.784,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '其他煤气',
+    CO: 8.955,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '天然气',
+    CO: 21.622,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '液化天然气',
+    CO: 2.899,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '原油',
+    CO: 3.020,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '汽油',
+    CO: 2.925,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '煤油',
+    CO: 3.033,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '柴油',
+    CO: 3.096,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '液化石油气',
+    CO: 3.101,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '燃料油',
+    CO: 3.170,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '炼厂干气',
+    CO: 3.012,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '其他石油制品',
+    CO: 2.527,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '电力',
+    CO: 11.367,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '热力',
+    CO: 0.130,
+    CH: 0,
+    NO: 0,
+  },
+])
 const sumArr = ref<string[]>([])
 // 总计
 const summary = (params: any) => {
@@ -50,6 +260,7 @@
   // sessionStorage.setItem('能源加工转换', JSON.stringify(value))
   return sums
 }
+
 // 排放量变化
 const watchConsumption = (event: any, index: number) => {
   // 当前变化的排放量的行
@@ -57,7 +268,7 @@
   // 变化的type
   const type = current.type
   // type对应的计算参数
-  const count = countParams.filter(item => item.type === type)[0]
+  const count = countParams.value.filter(item => item.type === type)[0]
   // CO₂
   if (current.emissionFactorCO === '1') {
     current.emissionsCO = (Number(event) * count.CO).toFixed(3)
@@ -82,12 +293,12 @@
 }
 // CO₂ 自测值
 const emissionFactorCO = (event: any, index: number) => {
-// 当前变化的排放量的行
+  // 当前变化的排放量的行
   const current = tableData.value[index]
   // 变化的type
   const type = current.type
   // type对应的计算参数
-  const count = countParams.filter(item => item.type === type)[0]
+  const count = countParams.value.filter(item => item.type === type)[0]
   if (current.emissionFactorCO === '1') {
     current.emissionsCO = (Number(event) * count.CO).toFixed(3)
   }
@@ -97,12 +308,12 @@
 }
 // CO₂ SELECT变换
 const emissionFactorCO1 = (event: any, index: number) => {
-// 当前变化的排放量的行
+  // 当前变化的排放量的行
   const current = tableData.value[index]
   // 变化的type
   const type = current.type
   // type对应的计算参数
-  const count = countParams.filter(item => item.type === type)[0]
+  const count = countParams.value.filter(item => item.type === type)[0]
   if (event === '1') {
     current.emissionsCO = (Number(current.consumption) * count.CO).toFixed(3)
   }
@@ -112,12 +323,12 @@
 }
 // CH₄ 自测值
 const emissionFactorCH = (event: any, index: number) => {
-// 当前变化的排放量的行
+  // 当前变化的排放量的行
   const current = tableData.value[index]
   // 变化的type
   const type = current.type
   // type对应的计算参数
-  const count = countParams.filter(item => item.type === type)[0]
+  const count = countParams.value.filter(item => item.type === type)[0]
   if (current.emissionFactorCH === '1') {
     current.emissionsCH = (Number(event) * count.CH).toFixed(3)
   }
@@ -127,12 +338,12 @@
 }
 // CH₄SELECT变换
 const emissionFactorCH1 = (event: any, index: number) => {
-// 当前变化的排放量的行
+  // 当前变化的排放量的行
   const current = tableData.value[index]
   // 变化的type
   const type = current.type
   // type对应的计算参数
-  const count = countParams.filter(item => item.type === type)[0]
+  const count = countParams.value.filter(item => item.type === type)[0]
   if (event === '1') {
     current.emissionsCH = (Number(current.consumption) * count.CH).toFixed(3)
   }
@@ -142,12 +353,12 @@
 }
 //  N₂O自测值
 const emissionFactorNO = (event: any, index: number) => {
-// 当前变化的排放量的行
+  // 当前变化的排放量的行
   const current = tableData.value[index]
   // 变化的type
   const type = current.type
   // type对应的计算参数
-  const count = countParams.filter(item => item.type === type)[0]
+  const count = countParams.value.filter(item => item.type === type)[0]
   if (current.emissionFactorNO === '1') {
     current.emissionsNO = (Number(event) * count.NO).toFixed(3)
   }
@@ -157,12 +368,12 @@
 }
 // N₂O SELECT变换
 const emissionFactorNO1 = (event: any, index: number) => {
-// 当前变化的排放量的行
+  // 当前变化的排放量的行
   const current = tableData.value[index]
   // 变化的type
   const type = current.type
   // type对应的计算参数
-  const count = countParams.filter(item => item.type === type)[0]
+  const count = countParams.value.filter(item => item.type === type)[0]
   if (event === '1') {
     current.emissionsNO = (Number(current.consumption) * count.NO).toFixed(3)
   }
@@ -192,6 +403,28 @@
   confirmArr.value = []
   cancelArr.value = []
 }
+// 合并行
+const objectSpanMethod = ({
+  row,
+  column,
+  rowIndex,
+  columnIndex,
+}: any) => {
+  if (columnIndex === 0) {
+    if (rowIndex % 2 === 0) {
+      return {
+        rowspan: 2,
+        colspan: 1,
+      }
+    }
+    else {
+      return {
+        rowspan: 0,
+        colspan: 0,
+      }
+    }
+  }
+}
 // 确认
 const confirm = () => {
   // selectData.value.forEach((item) => {
@@ -230,9 +463,25 @@
         emissionsNO: '',
         emissionFactorNO: '1',
         emissionFactorNO_value: '',
-        outputMode: '', // 产出方式
-        outputType: '', // 产出类型
-        amount: '转化与回收量',
+        outputMode: '转化', // 产出方式
+        outputType: item, // 产出类型
+        // amount: '转化与回收量',
+      },
+      {
+        type: item,
+        consumption: '',
+        emissionsCO: '',
+        emissionFactorCO: '1',
+        emissionFactorCO_value: '',
+        emissionsCH: '',
+        emissionFactorCH: '1',
+        emissionFactorCH_value: '',
+        emissionsNO: '',
+        emissionFactorNO: '1',
+        emissionFactorNO_value: '',
+        outputMode: '回收', // 产出方式
+        outputType: item, // 产出类型
+        // amount: '转化与回收量',
       },
     )
   })
@@ -261,6 +510,9 @@
     selectData.value.push(row.type)
   }
 }
+defineExpose({
+  sumArr, tableData,
+})
 </script>
 
 <template>
@@ -271,27 +523,40 @@
         <span>(选填)</span>
       </div>
       <div class="describe">
-        能源加工与转换排放是指为了特定的用途，将某种能源经过一定的工艺加工或转换成另外一种能源的过程中产生的排放。当转化与回收物为燃料时，单位为吨（t）；转化与回收物为燃气时，单位为万立方米（10⁴m³）；转化与回收物为电力时，单位为万千瓦时（10⁴kWh）；转化与回收物为热力时，单位为百万千焦（GJ）。CO₂、CH₄、N₂O 排放因子单位为：t/t燃料或t/10⁴m³燃气。
+        能源加工与转换排放是指为了特定的用途，将某种能源经过一定的工艺加工或转换成另外一种能源的过程中产生的排放。当转化与回收物为燃料时，单位为吨（t）；转化与回收物为燃气时，单位为万立方米（10⁴m³）；转化与回收物为电力时，单位为万千瓦时（10⁴kWh）；转化与回收物为热力时，单位为百万千焦（GJ）。CO₂、CH₄、N₂O
+        排放因子单位为：t/t燃料或t/10⁴m³燃气。
       </div>
-      <el-table :data="tableData" style="width: 100%;" :show-summary="true" :summary-method="summary" border :row-class-name="tableRowClassName">
+      <el-table
+        :data="tableData" style="width: 100%;" :span-method="objectSpanMethod" :show-summary="true" :summary-method="summary" border
+        :row-class-name="tableRowClassName"
+      >
         <el-table-column prop="type" label="类型" align="center" />
         <el-table-column prop="outputMode" label="产出方式" align="center" />
         <el-table-column prop="outputType" label="产出种类" align="center" />
-        <el-table-column prop="amount" label="转化与回收量(单位见说明)" align="center" />
-        <el-table-column prop="consumption" label="消耗量(t/10⁴m³)" align="center">
+        <!-- <el-table-column prop="amount" label="转化与回收量(单位见说明)" align="center" /> -->
+        <el-table-column prop="consumption" label="转化与回收量(单位见说明)" align="center">
           <template #default="scope">
-            <el-input v-model.trim="scope.row.consumption" @input="($event) => { watchConsumption($event, scope.$index) }" />
+            <el-input
+              v-model.trim="scope.row.consumption"
+              @input="($event) => { watchConsumption($event, scope.$index) }"
+            />
           </template>
         </el-table-column>
         <el-table-column label="CO₂" align="center">
           <el-table-column prop="emissionsCO" label="排放量(t)" align="center" />
           <el-table-column prop="emissionFactorCO" label="排放因子" align="left">
             <template #default="scope">
-              <el-select v-model.trim="scope.row.emissionFactorCO" style="width: 100%;" @change="($event) => { emissionFactorCO1($event, scope.$index) }">
+              <el-select
+                v-model.trim="scope.row.emissionFactorCO" style="width: 100%;"
+                @change="($event) => { emissionFactorCO1($event, scope.$index) }"
+              >
                 <el-option label="缺省值" value="1" />
                 <el-option label="自测值" value="2" />
               </el-select>
-              <el-input v-if="scope.row.emissionFactorCO === '2'" v-model="scope.row.emissionFactorCO_value" style="width: 70%;" class="input" @input="($event) => { emissionFactorCO($event, scope.$index) }" />
+              <el-input
+                v-if="scope.row.emissionFactorCO === '2'" v-model="scope.row.emissionFactorCO_value"
+                style="width: 70%;" class="input" @input="($event) => { emissionFactorCO($event, scope.$index) }"
+              />
             </template>
           </el-table-column>
         </el-table-column>
@@ -299,11 +564,17 @@
           <el-table-column prop="emissionsCH" label="排放量(kg)" align="center" />
           <el-table-column prop="emissionFactorCH" label="排放因子" align="left">
             <template #default="scope">
-              <el-select v-model.trim="scope.row.emissionFactorCH" style="width: 100%;" @change="($event) => { emissionFactorCH1($event, scope.$index) }">
+              <el-select
+                v-model.trim="scope.row.emissionFactorCH" style="width: 100%;"
+                @change="($event) => { emissionFactorCH1($event, scope.$index) }"
+              >
                 <el-option label="缺省值" value="1" />
                 <el-option label="自测值" value="2" />
               </el-select>
-              <el-input v-if="scope.row.emissionFactorCH === '2'" v-model="scope.row.emissionFactorCH_value" style="width: 70%;" class="input" @input="($event) => { emissionFactorCH($event, scope.$index) }" />
+              <el-input
+                v-if="scope.row.emissionFactorCH === '2'" v-model="scope.row.emissionFactorCH_value"
+                style="width: 70%;" class="input" @input="($event) => { emissionFactorCH($event, scope.$index) }"
+              />
             </template>
           </el-table-column>
         </el-table-column>
@@ -311,11 +582,17 @@
           <el-table-column prop="emissionsNO" label="排放量(kg)" align="center" />
           <el-table-column prop="emissionFactorNO" label="排放因子" align="left">
             <template #default="scope">
-              <el-select v-model="scope.row.emissionFactorNO" style="width: 100%;" @change="($event) => { emissionFactorNO1($event, scope.$index) }">
+              <el-select
+                v-model="scope.row.emissionFactorNO" style="width: 100%;"
+                @change="($event) => { emissionFactorNO1($event, scope.$index) }"
+              >
                 <el-option label="缺省值" value="1" />
                 <el-option label="自测值" value="2" />
               </el-select>
-              <el-input v-if="scope.row.emissionFactorNO === '2'" v-model="scope.row.emissionFactorNO_value" style="width: 70%;" class="input" @input="($event) => { emissionFactorNO($event, scope.$index) }" />
+              <el-input
+                v-if="scope.row.emissionFactorNO === '2'" v-model="scope.row.emissionFactorNO_value"
+                style="width: 70%;" class="input" @input="($event) => { emissionFactorNO($event, scope.$index) }"
+              />
             </template>
           </el-table-column>
         </el-table-column>
@@ -331,7 +608,10 @@
       <!-- 添加燃烧能源 -->
       <el-dialog v-model="dialogTableVisible" title="添加燃烧能源">
         <div class="container">
-          <div v-for="item in countParams" :key="item.type" class="item" :class="isSelect(item) ? 'item-select' : 'item-noselect'" @click="handler(item)">
+          <div
+            v-for="item in countParams" :key="item.type" class="item"
+            :class="isSelect(item) ? 'item-select' : 'item-noselect'" @click="handler(item)"
+          >
             {{ item.type }}
           </div>
         </div>

diff --git a/src/views/count/components/energyProcessing.vue b/src/views/count/components/energyProcessing.vue
index a653168..6e49692 100644
--- a/src/views/count/components/energyProcessing.vue
+++ b/src/views/count/components/energyProcessing.vue
@@ -1,15 +1,225 @@
 <!-- 能源加工转换 (选填) -->
 <script lang="ts" setup>
 // 表格数据
-const data: any = []
-const select: any = []
-// const localData = JSON.parse(sessionStorage.getItem('能源加工转换-table') as string || '')
-const tableData = ref(data)
+const data: any = [
+  {
+    type: '液化石油气',
+    consumption: '',
+    emissionsCO: '',
+    emissionFactorCO: '1',
+    emissionFactorCO_value: '',
+    emissionsCH: '',
+    emissionFactorCH: '1',
+    emissionFactorCH_value: '',
+    emissionsNO: '',
+    emissionFactorNO: '1',
+    emissionFactorNO_value: '',
+    outputMode: '转化', // 产出方式
+    outputType: '液化石油气', // 产出类型
+    // amount: '转化与回收量',
+  },
+  {
+    type: '液化石油气',
+    consumption: '',
+    emissionsCO: '',
+    emissionFactorCO: '1',
+    emissionFactorCO_value: '',
+    emissionsCH: '',
+    emissionFactorCH: '1',
+    emissionFactorCH_value: '',
+    emissionsNO: '',
+    emissionFactorNO: '1',
+    emissionFactorNO_value: '',
+    outputMode: '回收', // 产出方式
+    outputType: '液化石油气', // 产出类型
+    // amount: '转化与回收量',
+  },
+  {
+    type: '燃料油',
+    consumption: '',
+    emissionsCO: '',
+    emissionFactorCO: '1',
+    emissionFactorCO_value: '',
+    emissionsCH: '',
+    emissionFactorCH: '1',
+    emissionFactorCH_value: '',
+    emissionsNO: '',
+    emissionFactorNO: '1',
+    emissionFactorNO_value: '',
+    outputMode: '转化', // 产出方式
+    outputType: '燃料油', // 产出类型
+    // amount: '转化与回收量',
+  },
+  {
+    type: '燃料油',
+    consumption: '',
+    emissionsCO: '',
+    emissionFactorCO: '1',
+    emissionFactorCO_value: '',
+    emissionsCH: '',
+    emissionFactorCH: '1',
+    emissionFactorCH_value: '',
+    emissionsNO: '',
+    emissionFactorNO: '1',
+    emissionFactorNO_value: '',
+    outputMode: '回收', // 产出方式
+    outputType: '燃料油', // 产出类型
+    // amount: '转化与回收量',
+  },
+]
+const select: any = ['液化石油气', '燃料油']
+const localData = JSON.parse(sessionStorage.getItem('能源加工转换-table') as string)
+const tableData = ref(localData || data)
 const selectData = ref(select)
 const confirmArr = ref<string[]>([])
 const cancelArr = ref<string[]>([])
 // 计算参数
-const countParams = ref([])
+const countParams = ref([
+  {
+    type: '原煤',
+    CO: 1.981,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '洗精煤',
+    CO: 2.405,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '其他洗煤',
+    CO: 0.955,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '煤制品',
+    CO: 2.418,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '型煤',
+    CO: 1.950,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '水煤浆',
+    CO: 2.397,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '煤粉',
+    CO: 2.527,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '焦炭',
+    CO: 2.860,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '其他焦化产品',
+    CO: 3.833,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '焦炉煤气',
+    CO: 8.555,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '高炉煤气',
+    CO: 9.784,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '其他煤气',
+    CO: 8.955,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '天然气',
+    CO: 21.622,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '液化天然气',
+    CO: 2.899,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '原油',
+    CO: 3.020,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '汽油',
+    CO: 2.925,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '煤油',
+    CO: 3.033,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '柴油',
+    CO: 3.096,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '液化石油气',
+    CO: 3.101,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '燃料油',
+    CO: 3.170,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '炼厂干气',
+    CO: 3.012,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '其他石油制品',
+    CO: 2.527,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '电力',
+    CO: 11.367,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '热力',
+    CO: 0.130,
+    CH: 0,
+    NO: 0,
+  },
+])
 const sumArr = ref<string[]>([])
 // 总计
 const summary = (params: any) => {
@@ -50,6 +260,7 @@
   // sessionStorage.setItem('能源加工转换', JSON.stringify(value))
   return sums
 }
+
 // 排放量变化
 const watchConsumption = (event: any, index: number) => {
   // 当前变化的排放量的行
@@ -57,7 +268,7 @@
   // 变化的type
   const type = current.type
   // type对应的计算参数
-  const count = countParams.filter(item => item.type === type)[0]
+  const count = countParams.value.filter(item => item.type === type)[0]
   // CO₂
   if (current.emissionFactorCO === '1') {
     current.emissionsCO = (Number(event) * count.CO).toFixed(3)
@@ -82,12 +293,12 @@
 }
 // CO₂ 自测值
 const emissionFactorCO = (event: any, index: number) => {
-// 当前变化的排放量的行
+  // 当前变化的排放量的行
   const current = tableData.value[index]
   // 变化的type
   const type = current.type
   // type对应的计算参数
-  const count = countParams.filter(item => item.type === type)[0]
+  const count = countParams.value.filter(item => item.type === type)[0]
   if (current.emissionFactorCO === '1') {
     current.emissionsCO = (Number(event) * count.CO).toFixed(3)
   }
@@ -97,12 +308,12 @@
 }
 // CO₂ SELECT变换
 const emissionFactorCO1 = (event: any, index: number) => {
-// 当前变化的排放量的行
+  // 当前变化的排放量的行
   const current = tableData.value[index]
   // 变化的type
   const type = current.type
   // type对应的计算参数
-  const count = countParams.filter(item => item.type === type)[0]
+  const count = countParams.value.filter(item => item.type === type)[0]
   if (event === '1') {
     current.emissionsCO = (Number(current.consumption) * count.CO).toFixed(3)
   }
@@ -112,12 +323,12 @@
 }
 // CH₄ 自测值
 const emissionFactorCH = (event: any, index: number) => {
-// 当前变化的排放量的行
+  // 当前变化的排放量的行
   const current = tableData.value[index]
   // 变化的type
   const type = current.type
   // type对应的计算参数
-  const count = countParams.filter(item => item.type === type)[0]
+  const count = countParams.value.filter(item => item.type === type)[0]
   if (current.emissionFactorCH === '1') {
     current.emissionsCH = (Number(event) * count.CH).toFixed(3)
   }
@@ -127,12 +338,12 @@
 }
 // CH₄SELECT变换
 const emissionFactorCH1 = (event: any, index: number) => {
-// 当前变化的排放量的行
+  // 当前变化的排放量的行
   const current = tableData.value[index]
   // 变化的type
   const type = current.type
   // type对应的计算参数
-  const count = countParams.filter(item => item.type === type)[0]
+  const count = countParams.value.filter(item => item.type === type)[0]
   if (event === '1') {
     current.emissionsCH = (Number(current.consumption) * count.CH).toFixed(3)
   }
@@ -142,12 +353,12 @@
 }
 //  N₂O自测值
 const emissionFactorNO = (event: any, index: number) => {
-// 当前变化的排放量的行
+  // 当前变化的排放量的行
   const current = tableData.value[index]
   // 变化的type
   const type = current.type
   // type对应的计算参数
-  const count = countParams.filter(item => item.type === type)[0]
+  const count = countParams.value.filter(item => item.type === type)[0]
   if (current.emissionFactorNO === '1') {
     current.emissionsNO = (Number(event) * count.NO).toFixed(3)
   }
@@ -157,12 +368,12 @@
 }
 // N₂O SELECT变换
 const emissionFactorNO1 = (event: any, index: number) => {
-// 当前变化的排放量的行
+  // 当前变化的排放量的行
   const current = tableData.value[index]
   // 变化的type
   const type = current.type
   // type对应的计算参数
-  const count = countParams.filter(item => item.type === type)[0]
+  const count = countParams.value.filter(item => item.type === type)[0]
   if (event === '1') {
     current.emissionsNO = (Number(current.consumption) * count.NO).toFixed(3)
   }
@@ -192,6 +403,28 @@
   confirmArr.value = []
   cancelArr.value = []
 }
+// 合并行
+const objectSpanMethod = ({
+  row,
+  column,
+  rowIndex,
+  columnIndex,
+}: any) => {
+  if (columnIndex === 0) {
+    if (rowIndex % 2 === 0) {
+      return {
+        rowspan: 2,
+        colspan: 1,
+      }
+    }
+    else {
+      return {
+        rowspan: 0,
+        colspan: 0,
+      }
+    }
+  }
+}
 // 确认
 const confirm = () => {
   // selectData.value.forEach((item) => {
@@ -230,9 +463,25 @@
         emissionsNO: '',
         emissionFactorNO: '1',
         emissionFactorNO_value: '',
-        outputMode: '', // 产出方式
-        outputType: '', // 产出类型
-        amount: '转化与回收量',
+        outputMode: '转化', // 产出方式
+        outputType: item, // 产出类型
+        // amount: '转化与回收量',
+      },
+      {
+        type: item,
+        consumption: '',
+        emissionsCO: '',
+        emissionFactorCO: '1',
+        emissionFactorCO_value: '',
+        emissionsCH: '',
+        emissionFactorCH: '1',
+        emissionFactorCH_value: '',
+        emissionsNO: '',
+        emissionFactorNO: '1',
+        emissionFactorNO_value: '',
+        outputMode: '回收', // 产出方式
+        outputType: item, // 产出类型
+        // amount: '转化与回收量',
       },
     )
   })
@@ -261,6 +510,9 @@
     selectData.value.push(row.type)
   }
 }
+defineExpose({
+  sumArr, tableData,
+})
 </script>
 
 <template>
@@ -271,27 +523,40 @@
         <span>(选填)</span>
       </div>
       <div class="describe">
-        能源加工与转换排放是指为了特定的用途，将某种能源经过一定的工艺加工或转换成另外一种能源的过程中产生的排放。当转化与回收物为燃料时，单位为吨（t）；转化与回收物为燃气时，单位为万立方米（10⁴m³）；转化与回收物为电力时，单位为万千瓦时（10⁴kWh）；转化与回收物为热力时，单位为百万千焦（GJ）。CO₂、CH₄、N₂O 排放因子单位为：t/t燃料或t/10⁴m³燃气。
+        能源加工与转换排放是指为了特定的用途，将某种能源经过一定的工艺加工或转换成另外一种能源的过程中产生的排放。当转化与回收物为燃料时，单位为吨（t）；转化与回收物为燃气时，单位为万立方米（10⁴m³）；转化与回收物为电力时，单位为万千瓦时（10⁴kWh）；转化与回收物为热力时，单位为百万千焦（GJ）。CO₂、CH₄、N₂O
+        排放因子单位为：t/t燃料或t/10⁴m³燃气。
       </div>
-      <el-table :data="tableData" style="width: 100%;" :show-summary="true" :summary-method="summary" border :row-class-name="tableRowClassName">
+      <el-table
+        :data="tableData" style="width: 100%;" :span-method="objectSpanMethod" :show-summary="true" :summary-method="summary" border
+        :row-class-name="tableRowClassName"
+      >
         <el-table-column prop="type" label="类型" align="center" />
         <el-table-column prop="outputMode" label="产出方式" align="center" />
         <el-table-column prop="outputType" label="产出种类" align="center" />
-        <el-table-column prop="amount" label="转化与回收量(单位见说明)" align="center" />
-        <el-table-column prop="consumption" label="消耗量(t/10⁴m³)" align="center">
+        <!-- <el-table-column prop="amount" label="转化与回收量(单位见说明)" align="center" /> -->
+        <el-table-column prop="consumption" label="转化与回收量(单位见说明)" align="center">
           <template #default="scope">
-            <el-input v-model.trim="scope.row.consumption" @input="($event) => { watchConsumption($event, scope.$index) }" />
+            <el-input
+              v-model.trim="scope.row.consumption"
+              @input="($event) => { watchConsumption($event, scope.$index) }"
+            />
           </template>
         </el-table-column>
         <el-table-column label="CO₂" align="center">
           <el-table-column prop="emissionsCO" label="排放量(t)" align="center" />
           <el-table-column prop="emissionFactorCO" label="排放因子" align="left">
             <template #default="scope">
-              <el-select v-model.trim="scope.row.emissionFactorCO" style="width: 100%;" @change="($event) => { emissionFactorCO1($event, scope.$index) }">
+              <el-select
+                v-model.trim="scope.row.emissionFactorCO" style="width: 100%;"
+                @change="($event) => { emissionFactorCO1($event, scope.$index) }"
+              >
                 <el-option label="缺省值" value="1" />
                 <el-option label="自测值" value="2" />
               </el-select>
-              <el-input v-if="scope.row.emissionFactorCO === '2'" v-model="scope.row.emissionFactorCO_value" style="width: 70%;" class="input" @input="($event) => { emissionFactorCO($event, scope.$index) }" />
+              <el-input
+                v-if="scope.row.emissionFactorCO === '2'" v-model="scope.row.emissionFactorCO_value"
+                style="width: 70%;" class="input" @input="($event) => { emissionFactorCO($event, scope.$index) }"
+              />
             </template>
           </el-table-column>
         </el-table-column>
@@ -299,11 +564,17 @@
           <el-table-column prop="emissionsCH" label="排放量(kg)" align="center" />
           <el-table-column prop="emissionFactorCH" label="排放因子" align="left">
             <template #default="scope">
-              <el-select v-model.trim="scope.row.emissionFactorCH" style="width: 100%;" @change="($event) => { emissionFactorCH1($event, scope.$index) }">
+              <el-select
+                v-model.trim="scope.row.emissionFactorCH" style="width: 100%;"
+                @change="($event) => { emissionFactorCH1($event, scope.$index) }"
+              >
                 <el-option label="缺省值" value="1" />
                 <el-option label="自测值" value="2" />
               </el-select>
-              <el-input v-if="scope.row.emissionFactorCH === '2'" v-model="scope.row.emissionFactorCH_value" style="width: 70%;" class="input" @input="($event) => { emissionFactorCH($event, scope.$index) }" />
+              <el-input
+                v-if="scope.row.emissionFactorCH === '2'" v-model="scope.row.emissionFactorCH_value"
+                style="width: 70%;" class="input" @input="($event) => { emissionFactorCH($event, scope.$index) }"
+              />
             </template>
           </el-table-column>
         </el-table-column>
@@ -311,11 +582,17 @@
           <el-table-column prop="emissionsNO" label="排放量(kg)" align="center" />
           <el-table-column prop="emissionFactorNO" label="排放因子" align="left">
             <template #default="scope">
-              <el-select v-model="scope.row.emissionFactorNO" style="width: 100%;" @change="($event) => { emissionFactorNO1($event, scope.$index) }">
+              <el-select
+                v-model="scope.row.emissionFactorNO" style="width: 100%;"
+                @change="($event) => { emissionFactorNO1($event, scope.$index) }"
+              >
                 <el-option label="缺省值" value="1" />
                 <el-option label="自测值" value="2" />
               </el-select>
-              <el-input v-if="scope.row.emissionFactorNO === '2'" v-model="scope.row.emissionFactorNO_value" style="width: 70%;" class="input" @input="($event) => { emissionFactorNO($event, scope.$index) }" />
+              <el-input
+                v-if="scope.row.emissionFactorNO === '2'" v-model="scope.row.emissionFactorNO_value"
+                style="width: 70%;" class="input" @input="($event) => { emissionFactorNO($event, scope.$index) }"
+              />
             </template>
           </el-table-column>
         </el-table-column>
@@ -331,7 +608,10 @@
       <!-- 添加燃烧能源 -->
       <el-dialog v-model="dialogTableVisible" title="添加燃烧能源">
         <div class="container">
-          <div v-for="item in countParams" :key="item.type" class="item" :class="isSelect(item) ? 'item-select' : 'item-noselect'" @click="handler(item)">
+          <div
+            v-for="item in countParams" :key="item.type" class="item"
+            :class="isSelect(item) ? 'item-select' : 'item-noselect'" @click="handler(item)"
+          >
             {{ item.type }}
           </div>
         </div>
diff --git a/src/views/count/list.vue b/src/views/count/list.vue
index 2e5cb8c..9afc21f 100644
--- a/src/views/count/list.vue
+++ b/src/views/count/list.vue
@@ -15,9 +15,9 @@
         title: '能源转换加工',
         point: 'energyProcessing',
       },
-      {
-        title: '工艺排放',
-      },
+      // {
+      //   title: '工艺排放',
+      // },
     ],
   },
   {

diff --git a/src/views/count/components/energyProcessing.vue b/src/views/count/components/energyProcessing.vue
index a653168..6e49692 100644
--- a/src/views/count/components/energyProcessing.vue
+++ b/src/views/count/components/energyProcessing.vue
@@ -1,15 +1,225 @@
 <!-- 能源加工转换 (选填) -->
 <script lang="ts" setup>
 // 表格数据
-const data: any = []
-const select: any = []
-// const localData = JSON.parse(sessionStorage.getItem('能源加工转换-table') as string || '')
-const tableData = ref(data)
+const data: any = [
+  {
+    type: '液化石油气',
+    consumption: '',
+    emissionsCO: '',
+    emissionFactorCO: '1',
+    emissionFactorCO_value: '',
+    emissionsCH: '',
+    emissionFactorCH: '1',
+    emissionFactorCH_value: '',
+    emissionsNO: '',
+    emissionFactorNO: '1',
+    emissionFactorNO_value: '',
+    outputMode: '转化', // 产出方式
+    outputType: '液化石油气', // 产出类型
+    // amount: '转化与回收量',
+  },
+  {
+    type: '液化石油气',
+    consumption: '',
+    emissionsCO: '',
+    emissionFactorCO: '1',
+    emissionFactorCO_value: '',
+    emissionsCH: '',
+    emissionFactorCH: '1',
+    emissionFactorCH_value: '',
+    emissionsNO: '',
+    emissionFactorNO: '1',
+    emissionFactorNO_value: '',
+    outputMode: '回收', // 产出方式
+    outputType: '液化石油气', // 产出类型
+    // amount: '转化与回收量',
+  },
+  {
+    type: '燃料油',
+    consumption: '',
+    emissionsCO: '',
+    emissionFactorCO: '1',
+    emissionFactorCO_value: '',
+    emissionsCH: '',
+    emissionFactorCH: '1',
+    emissionFactorCH_value: '',
+    emissionsNO: '',
+    emissionFactorNO: '1',
+    emissionFactorNO_value: '',
+    outputMode: '转化', // 产出方式
+    outputType: '燃料油', // 产出类型
+    // amount: '转化与回收量',
+  },
+  {
+    type: '燃料油',
+    consumption: '',
+    emissionsCO: '',
+    emissionFactorCO: '1',
+    emissionFactorCO_value: '',
+    emissionsCH: '',
+    emissionFactorCH: '1',
+    emissionFactorCH_value: '',
+    emissionsNO: '',
+    emissionFactorNO: '1',
+    emissionFactorNO_value: '',
+    outputMode: '回收', // 产出方式
+    outputType: '燃料油', // 产出类型
+    // amount: '转化与回收量',
+  },
+]
+const select: any = ['液化石油气', '燃料油']
+const localData = JSON.parse(sessionStorage.getItem('能源加工转换-table') as string)
+const tableData = ref(localData || data)
 const selectData = ref(select)
 const confirmArr = ref<string[]>([])
 const cancelArr = ref<string[]>([])
 // 计算参数
-const countParams = ref([])
+const countParams = ref([
+  {
+    type: '原煤',
+    CO: 1.981,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '洗精煤',
+    CO: 2.405,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '其他洗煤',
+    CO: 0.955,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '煤制品',
+    CO: 2.418,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '型煤',
+    CO: 1.950,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '水煤浆',
+    CO: 2.397,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '煤粉',
+    CO: 2.527,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '焦炭',
+    CO: 2.860,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '其他焦化产品',
+    CO: 3.833,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '焦炉煤气',
+    CO: 8.555,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '高炉煤气',
+    CO: 9.784,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '其他煤气',
+    CO: 8.955,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '天然气',
+    CO: 21.622,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '液化天然气',
+    CO: 2.899,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '原油',
+    CO: 3.020,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '汽油',
+    CO: 2.925,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '煤油',
+    CO: 3.033,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '柴油',
+    CO: 3.096,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '液化石油气',
+    CO: 3.101,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '燃料油',
+    CO: 3.170,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '炼厂干气',
+    CO: 3.012,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '其他石油制品',
+    CO: 2.527,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '电力',
+    CO: 11.367,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '热力',
+    CO: 0.130,
+    CH: 0,
+    NO: 0,
+  },
+])
 const sumArr = ref<string[]>([])
 // 总计
 const summary = (params: any) => {
@@ -50,6 +260,7 @@
   // sessionStorage.setItem('能源加工转换', JSON.stringify(value))
   return sums
 }
+
 // 排放量变化
 const watchConsumption = (event: any, index: number) => {
   // 当前变化的排放量的行
@@ -57,7 +268,7 @@
   // 变化的type
   const type = current.type
   // type对应的计算参数
-  const count = countParams.filter(item => item.type === type)[0]
+  const count = countParams.value.filter(item => item.type === type)[0]
   // CO₂
   if (current.emissionFactorCO === '1') {
     current.emissionsCO = (Number(event) * count.CO).toFixed(3)
@@ -82,12 +293,12 @@
 }
 // CO₂ 自测值
 const emissionFactorCO = (event: any, index: number) => {
-// 当前变化的排放量的行
+  // 当前变化的排放量的行
   const current = tableData.value[index]
   // 变化的type
   const type = current.type
   // type对应的计算参数
-  const count = countParams.filter(item => item.type === type)[0]
+  const count = countParams.value.filter(item => item.type === type)[0]
   if (current.emissionFactorCO === '1') {
     current.emissionsCO = (Number(event) * count.CO).toFixed(3)
   }
@@ -97,12 +308,12 @@
 }
 // CO₂ SELECT变换
 const emissionFactorCO1 = (event: any, index: number) => {
-// 当前变化的排放量的行
+  // 当前变化的排放量的行
   const current = tableData.value[index]
   // 变化的type
   const type = current.type
   // type对应的计算参数
-  const count = countParams.filter(item => item.type === type)[0]
+  const count = countParams.value.filter(item => item.type === type)[0]
   if (event === '1') {
     current.emissionsCO = (Number(current.consumption) * count.CO).toFixed(3)
   }
@@ -112,12 +323,12 @@
 }
 // CH₄ 自测值
 const emissionFactorCH = (event: any, index: number) => {
-// 当前变化的排放量的行
+  // 当前变化的排放量的行
   const current = tableData.value[index]
   // 变化的type
   const type = current.type
   // type对应的计算参数
-  const count = countParams.filter(item => item.type === type)[0]
+  const count = countParams.value.filter(item => item.type === type)[0]
   if (current.emissionFactorCH === '1') {
     current.emissionsCH = (Number(event) * count.CH).toFixed(3)
   }
@@ -127,12 +338,12 @@
 }
 // CH₄SELECT变换
 const emissionFactorCH1 = (event: any, index: number) => {
-// 当前变化的排放量的行
+  // 当前变化的排放量的行
   const current = tableData.value[index]
   // 变化的type
   const type = current.type
   // type对应的计算参数
-  const count = countParams.filter(item => item.type === type)[0]
+  const count = countParams.value.filter(item => item.type === type)[0]
   if (event === '1') {
     current.emissionsCH = (Number(current.consumption) * count.CH).toFixed(3)
   }
@@ -142,12 +353,12 @@
 }
 //  N₂O自测值
 const emissionFactorNO = (event: any, index: number) => {
-// 当前变化的排放量的行
+  // 当前变化的排放量的行
   const current = tableData.value[index]
   // 变化的type
   const type = current.type
   // type对应的计算参数
-  const count = countParams.filter(item => item.type === type)[0]
+  const count = countParams.value.filter(item => item.type === type)[0]
   if (current.emissionFactorNO === '1') {
     current.emissionsNO = (Number(event) * count.NO).toFixed(3)
   }
@@ -157,12 +368,12 @@
 }
 // N₂O SELECT变换
 const emissionFactorNO1 = (event: any, index: number) => {
-// 当前变化的排放量的行
+  // 当前变化的排放量的行
   const current = tableData.value[index]
   // 变化的type
   const type = current.type
   // type对应的计算参数
-  const count = countParams.filter(item => item.type === type)[0]
+  const count = countParams.value.filter(item => item.type === type)[0]
   if (event === '1') {
     current.emissionsNO = (Number(current.consumption) * count.NO).toFixed(3)
   }
@@ -192,6 +403,28 @@
   confirmArr.value = []
   cancelArr.value = []
 }
+// 合并行
+const objectSpanMethod = ({
+  row,
+  column,
+  rowIndex,
+  columnIndex,
+}: any) => {
+  if (columnIndex === 0) {
+    if (rowIndex % 2 === 0) {
+      return {
+        rowspan: 2,
+        colspan: 1,
+      }
+    }
+    else {
+      return {
+        rowspan: 0,
+        colspan: 0,
+      }
+    }
+  }
+}
 // 确认
 const confirm = () => {
   // selectData.value.forEach((item) => {
@@ -230,9 +463,25 @@
         emissionsNO: '',
         emissionFactorNO: '1',
         emissionFactorNO_value: '',
-        outputMode: '', // 产出方式
-        outputType: '', // 产出类型
-        amount: '转化与回收量',
+        outputMode: '转化', // 产出方式
+        outputType: item, // 产出类型
+        // amount: '转化与回收量',
+      },
+      {
+        type: item,
+        consumption: '',
+        emissionsCO: '',
+        emissionFactorCO: '1',
+        emissionFactorCO_value: '',
+        emissionsCH: '',
+        emissionFactorCH: '1',
+        emissionFactorCH_value: '',
+        emissionsNO: '',
+        emissionFactorNO: '1',
+        emissionFactorNO_value: '',
+        outputMode: '回收', // 产出方式
+        outputType: item, // 产出类型
+        // amount: '转化与回收量',
       },
     )
   })
@@ -261,6 +510,9 @@
     selectData.value.push(row.type)
   }
 }
+defineExpose({
+  sumArr, tableData,
+})
 </script>
 
 <template>
@@ -271,27 +523,40 @@
         <span>(选填)</span>
       </div>
       <div class="describe">
-        能源加工与转换排放是指为了特定的用途，将某种能源经过一定的工艺加工或转换成另外一种能源的过程中产生的排放。当转化与回收物为燃料时，单位为吨（t）；转化与回收物为燃气时，单位为万立方米（10⁴m³）；转化与回收物为电力时，单位为万千瓦时（10⁴kWh）；转化与回收物为热力时，单位为百万千焦（GJ）。CO₂、CH₄、N₂O 排放因子单位为：t/t燃料或t/10⁴m³燃气。
+        能源加工与转换排放是指为了特定的用途，将某种能源经过一定的工艺加工或转换成另外一种能源的过程中产生的排放。当转化与回收物为燃料时，单位为吨（t）；转化与回收物为燃气时，单位为万立方米（10⁴m³）；转化与回收物为电力时，单位为万千瓦时（10⁴kWh）；转化与回收物为热力时，单位为百万千焦（GJ）。CO₂、CH₄、N₂O
+        排放因子单位为：t/t燃料或t/10⁴m³燃气。
       </div>
-      <el-table :data="tableData" style="width: 100%;" :show-summary="true" :summary-method="summary" border :row-class-name="tableRowClassName">
+      <el-table
+        :data="tableData" style="width: 100%;" :span-method="objectSpanMethod" :show-summary="true" :summary-method="summary" border
+        :row-class-name="tableRowClassName"
+      >
         <el-table-column prop="type" label="类型" align="center" />
         <el-table-column prop="outputMode" label="产出方式" align="center" />
         <el-table-column prop="outputType" label="产出种类" align="center" />
-        <el-table-column prop="amount" label="转化与回收量(单位见说明)" align="center" />
-        <el-table-column prop="consumption" label="消耗量(t/10⁴m³)" align="center">
+        <!-- <el-table-column prop="amount" label="转化与回收量(单位见说明)" align="center" /> -->
+        <el-table-column prop="consumption" label="转化与回收量(单位见说明)" align="center">
           <template #default="scope">
-            <el-input v-model.trim="scope.row.consumption" @input="($event) => { watchConsumption($event, scope.$index) }" />
+            <el-input
+              v-model.trim="scope.row.consumption"
+              @input="($event) => { watchConsumption($event, scope.$index) }"
+            />
           </template>
         </el-table-column>
         <el-table-column label="CO₂" align="center">
           <el-table-column prop="emissionsCO" label="排放量(t)" align="center" />
           <el-table-column prop="emissionFactorCO" label="排放因子" align="left">
             <template #default="scope">
-              <el-select v-model.trim="scope.row.emissionFactorCO" style="width: 100%;" @change="($event) => { emissionFactorCO1($event, scope.$index) }">
+              <el-select
+                v-model.trim="scope.row.emissionFactorCO" style="width: 100%;"
+                @change="($event) => { emissionFactorCO1($event, scope.$index) }"
+              >
                 <el-option label="缺省值" value="1" />
                 <el-option label="自测值" value="2" />
               </el-select>
-              <el-input v-if="scope.row.emissionFactorCO === '2'" v-model="scope.row.emissionFactorCO_value" style="width: 70%;" class="input" @input="($event) => { emissionFactorCO($event, scope.$index) }" />
+              <el-input
+                v-if="scope.row.emissionFactorCO === '2'" v-model="scope.row.emissionFactorCO_value"
+                style="width: 70%;" class="input" @input="($event) => { emissionFactorCO($event, scope.$index) }"
+              />
             </template>
           </el-table-column>
         </el-table-column>
@@ -299,11 +564,17 @@
           <el-table-column prop="emissionsCH" label="排放量(kg)" align="center" />
           <el-table-column prop="emissionFactorCH" label="排放因子" align="left">
             <template #default="scope">
-              <el-select v-model.trim="scope.row.emissionFactorCH" style="width: 100%;" @change="($event) => { emissionFactorCH1($event, scope.$index) }">
+              <el-select
+                v-model.trim="scope.row.emissionFactorCH" style="width: 100%;"
+                @change="($event) => { emissionFactorCH1($event, scope.$index) }"
+              >
                 <el-option label="缺省值" value="1" />
                 <el-option label="自测值" value="2" />
               </el-select>
-              <el-input v-if="scope.row.emissionFactorCH === '2'" v-model="scope.row.emissionFactorCH_value" style="width: 70%;" class="input" @input="($event) => { emissionFactorCH($event, scope.$index) }" />
+              <el-input
+                v-if="scope.row.emissionFactorCH === '2'" v-model="scope.row.emissionFactorCH_value"
+                style="width: 70%;" class="input" @input="($event) => { emissionFactorCH($event, scope.$index) }"
+              />
             </template>
           </el-table-column>
         </el-table-column>
@@ -311,11 +582,17 @@
           <el-table-column prop="emissionsNO" label="排放量(kg)" align="center" />
           <el-table-column prop="emissionFactorNO" label="排放因子" align="left">
             <template #default="scope">
-              <el-select v-model="scope.row.emissionFactorNO" style="width: 100%;" @change="($event) => { emissionFactorNO1($event, scope.$index) }">
+              <el-select
+                v-model="scope.row.emissionFactorNO" style="width: 100%;"
+                @change="($event) => { emissionFactorNO1($event, scope.$index) }"
+              >
                 <el-option label="缺省值" value="1" />
                 <el-option label="自测值" value="2" />
               </el-select>
-              <el-input v-if="scope.row.emissionFactorNO === '2'" v-model="scope.row.emissionFactorNO_value" style="width: 70%;" class="input" @input="($event) => { emissionFactorNO($event, scope.$index) }" />
+              <el-input
+                v-if="scope.row.emissionFactorNO === '2'" v-model="scope.row.emissionFactorNO_value"
+                style="width: 70%;" class="input" @input="($event) => { emissionFactorNO($event, scope.$index) }"
+              />
             </template>
           </el-table-column>
         </el-table-column>
@@ -331,7 +608,10 @@
       <!-- 添加燃烧能源 -->
       <el-dialog v-model="dialogTableVisible" title="添加燃烧能源">
         <div class="container">
-          <div v-for="item in countParams" :key="item.type" class="item" :class="isSelect(item) ? 'item-select' : 'item-noselect'" @click="handler(item)">
+          <div
+            v-for="item in countParams" :key="item.type" class="item"
+            :class="isSelect(item) ? 'item-select' : 'item-noselect'" @click="handler(item)"
+          >
             {{ item.type }}
           </div>
         </div>
diff --git a/src/views/count/list.vue b/src/views/count/list.vue
index 2e5cb8c..9afc21f 100644
--- a/src/views/count/list.vue
+++ b/src/views/count/list.vue
@@ -15,9 +15,9 @@
         title: '能源转换加工',
         point: 'energyProcessing',
       },
-      {
-        title: '工艺排放',
-      },
+      // {
+      //   title: '工艺排放',
+      // },
     ],
   },
   {
diff --git a/src/views/count/table.vue b/src/views/count/table.vue
index 28920a4..94ccf87 100644
--- a/src/views/count/table.vue
+++ b/src/views/count/table.vue
@@ -54,9 +54,9 @@
   const energyData = energyRef.value.sumArr
   const value3 = {
     name: '能源加工转换',
-    co: 0,
-    ch: 0,
-    no: 0,
+    co: energyData[4],
+    ch: energyData[6],
+    no: energyData[8],
   }
   sessionStorage.setItem('能源加工转换', JSON.stringify(value3))
   // 购入热力

diff --git a/src/views/count/components/energyProcessing.vue b/src/views/count/components/energyProcessing.vue
index a653168..6e49692 100644
--- a/src/views/count/components/energyProcessing.vue
+++ b/src/views/count/components/energyProcessing.vue
@@ -1,15 +1,225 @@
 <!-- 能源加工转换 (选填) -->
 <script lang="ts" setup>
 // 表格数据
-const data: any = []
-const select: any = []
-// const localData = JSON.parse(sessionStorage.getItem('能源加工转换-table') as string || '')
-const tableData = ref(data)
+const data: any = [
+  {
+    type: '液化石油气',
+    consumption: '',
+    emissionsCO: '',
+    emissionFactorCO: '1',
+    emissionFactorCO_value: '',
+    emissionsCH: '',
+    emissionFactorCH: '1',
+    emissionFactorCH_value: '',
+    emissionsNO: '',
+    emissionFactorNO: '1',
+    emissionFactorNO_value: '',
+    outputMode: '转化', // 产出方式
+    outputType: '液化石油气', // 产出类型
+    // amount: '转化与回收量',
+  },
+  {
+    type: '液化石油气',
+    consumption: '',
+    emissionsCO: '',
+    emissionFactorCO: '1',
+    emissionFactorCO_value: '',
+    emissionsCH: '',
+    emissionFactorCH: '1',
+    emissionFactorCH_value: '',
+    emissionsNO: '',
+    emissionFactorNO: '1',
+    emissionFactorNO_value: '',
+    outputMode: '回收', // 产出方式
+    outputType: '液化石油气', // 产出类型
+    // amount: '转化与回收量',
+  },
+  {
+    type: '燃料油',
+    consumption: '',
+    emissionsCO: '',
+    emissionFactorCO: '1',
+    emissionFactorCO_value: '',
+    emissionsCH: '',
+    emissionFactorCH: '1',
+    emissionFactorCH_value: '',
+    emissionsNO: '',
+    emissionFactorNO: '1',
+    emissionFactorNO_value: '',
+    outputMode: '转化', // 产出方式
+    outputType: '燃料油', // 产出类型
+    // amount: '转化与回收量',
+  },
+  {
+    type: '燃料油',
+    consumption: '',
+    emissionsCO: '',
+    emissionFactorCO: '1',
+    emissionFactorCO_value: '',
+    emissionsCH: '',
+    emissionFactorCH: '1',
+    emissionFactorCH_value: '',
+    emissionsNO: '',
+    emissionFactorNO: '1',
+    emissionFactorNO_value: '',
+    outputMode: '回收', // 产出方式
+    outputType: '燃料油', // 产出类型
+    // amount: '转化与回收量',
+  },
+]
+const select: any = ['液化石油气', '燃料油']
+const localData = JSON.parse(sessionStorage.getItem('能源加工转换-table') as string)
+const tableData = ref(localData || data)
 const selectData = ref(select)
 const confirmArr = ref<string[]>([])
 const cancelArr = ref<string[]>([])
 // 计算参数
-const countParams = ref([])
+const countParams = ref([
+  {
+    type: '原煤',
+    CO: 1.981,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '洗精煤',
+    CO: 2.405,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '其他洗煤',
+    CO: 0.955,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '煤制品',
+    CO: 2.418,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '型煤',
+    CO: 1.950,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '水煤浆',
+    CO: 2.397,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '煤粉',
+    CO: 2.527,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '焦炭',
+    CO: 2.860,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '其他焦化产品',
+    CO: 3.833,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '焦炉煤气',
+    CO: 8.555,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '高炉煤气',
+    CO: 9.784,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '其他煤气',
+    CO: 8.955,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '天然气',
+    CO: 21.622,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '液化天然气',
+    CO: 2.899,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '原油',
+    CO: 3.020,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '汽油',
+    CO: 2.925,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '煤油',
+    CO: 3.033,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '柴油',
+    CO: 3.096,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '液化石油气',
+    CO: 3.101,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '燃料油',
+    CO: 3.170,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '炼厂干气',
+    CO: 3.012,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '其他石油制品',
+    CO: 2.527,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '电力',
+    CO: 11.367,
+    CH: 0,
+    NO: 0,
+  },
+  {
+    type: '热力',
+    CO: 0.130,
+    CH: 0,
+    NO: 0,
+  },
+])
 const sumArr = ref<string[]>([])
 // 总计
 const summary = (params: any) => {
@@ -50,6 +260,7 @@
   // sessionStorage.setItem('能源加工转换', JSON.stringify(value))
   return sums
 }
+
 // 排放量变化
 const watchConsumption = (event: any, index: number) => {
   // 当前变化的排放量的行
@@ -57,7 +268,7 @@
   // 变化的type
   const type = current.type
   // type对应的计算参数
-  const count = countParams.filter(item => item.type === type)[0]
+  const count = countParams.value.filter(item => item.type === type)[0]
   // CO₂
   if (current.emissionFactorCO === '1') {
     current.emissionsCO = (Number(event) * count.CO).toFixed(3)
@@ -82,12 +293,12 @@
 }
 // CO₂ 自测值
 const emissionFactorCO = (event: any, index: number) => {
-// 当前变化的排放量的行
+  // 当前变化的排放量的行
   const current = tableData.value[index]
   // 变化的type
   const type = current.type
   // type对应的计算参数
-  const count = countParams.filter(item => item.type === type)[0]
+  const count = countParams.value.filter(item => item.type === type)[0]
   if (current.emissionFactorCO === '1') {
     current.emissionsCO = (Number(event) * count.CO).toFixed(3)
   }
@@ -97,12 +308,12 @@
 }
 // CO₂ SELECT变换
 const emissionFactorCO1 = (event: any, index: number) => {
-// 当前变化的排放量的行
+  // 当前变化的排放量的行
   const current = tableData.value[index]
   // 变化的type
   const type = current.type
   // type对应的计算参数
-  const count = countParams.filter(item => item.type === type)[0]
+  const count = countParams.value.filter(item => item.type === type)[0]
   if (event === '1') {
     current.emissionsCO = (Number(current.consumption) * count.CO).toFixed(3)
   }
@@ -112,12 +323,12 @@
 }
 // CH₄ 自测值
 const emissionFactorCH = (event: any, index: number) => {
-// 当前变化的排放量的行
+  // 当前变化的排放量的行
   const current = tableData.value[index]
   // 变化的type
   const type = current.type
   // type对应的计算参数
-  const count = countParams.filter(item => item.type === type)[0]
+  const count = countParams.value.filter(item => item.type === type)[0]
   if (current.emissionFactorCH === '1') {
     current.emissionsCH = (Number(event) * count.CH).toFixed(3)
   }
@@ -127,12 +338,12 @@
 }
 // CH₄SELECT变换
 const emissionFactorCH1 = (event: any, index: number) => {
-// 当前变化的排放量的行
+  // 当前变化的排放量的行
   const current = tableData.value[index]
   // 变化的type
   const type = current.type
   // type对应的计算参数
-  const count = countParams.filter(item => item.type === type)[0]
+  const count = countParams.value.filter(item => item.type === type)[0]
   if (event === '1') {
     current.emissionsCH = (Number(current.consumption) * count.CH).toFixed(3)
   }
@@ -142,12 +353,12 @@
 }
 //  N₂O自测值
 const emissionFactorNO = (event: any, index: number) => {
-// 当前变化的排放量的行
+  // 当前变化的排放量的行
   const current = tableData.value[index]
   // 变化的type
   const type = current.type
   // type对应的计算参数
-  const count = countParams.filter(item => item.type === type)[0]
+  const count = countParams.value.filter(item => item.type === type)[0]
   if (current.emissionFactorNO === '1') {
     current.emissionsNO = (Number(event) * count.NO).toFixed(3)
   }
@@ -157,12 +368,12 @@
 }
 // N₂O SELECT变换
 const emissionFactorNO1 = (event: any, index: number) => {
-// 当前变化的排放量的行
+  // 当前变化的排放量的行
   const current = tableData.value[index]
   // 变化的type
   const type = current.type
   // type对应的计算参数
-  const count = countParams.filter(item => item.type === type)[0]
+  const count = countParams.value.filter(item => item.type === type)[0]
   if (event === '1') {
     current.emissionsNO = (Number(current.consumption) * count.NO).toFixed(3)
   }
@@ -192,6 +403,28 @@
   confirmArr.value = []
   cancelArr.value = []
 }
+// 合并行
+const objectSpanMethod = ({
+  row,
+  column,
+  rowIndex,
+  columnIndex,
+}: any) => {
+  if (columnIndex === 0) {
+    if (rowIndex % 2 === 0) {
+      return {
+        rowspan: 2,
+        colspan: 1,
+      }
+    }
+    else {
+      return {
+        rowspan: 0,
+        colspan: 0,
+      }
+    }
+  }
+}
 // 确认
 const confirm = () => {
   // selectData.value.forEach((item) => {
@@ -230,9 +463,25 @@
         emissionsNO: '',
         emissionFactorNO: '1',
         emissionFactorNO_value: '',
-        outputMode: '', // 产出方式
-        outputType: '', // 产出类型
-        amount: '转化与回收量',
+        outputMode: '转化', // 产出方式
+        outputType: item, // 产出类型
+        // amount: '转化与回收量',
+      },
+      {
+        type: item,
+        consumption: '',
+        emissionsCO: '',
+        emissionFactorCO: '1',
+        emissionFactorCO_value: '',
+        emissionsCH: '',
+        emissionFactorCH: '1',
+        emissionFactorCH_value: '',
+        emissionsNO: '',
+        emissionFactorNO: '1',
+        emissionFactorNO_value: '',
+        outputMode: '回收', // 产出方式
+        outputType: item, // 产出类型
+        // amount: '转化与回收量',
       },
     )
   })
@@ -261,6 +510,9 @@
     selectData.value.push(row.type)
   }
 }
+defineExpose({
+  sumArr, tableData,
+})
 </script>
 
 <template>
@@ -271,27 +523,40 @@
         <span>(选填)</span>
       </div>
       <div class="describe">
-        能源加工与转换排放是指为了特定的用途，将某种能源经过一定的工艺加工或转换成另外一种能源的过程中产生的排放。当转化与回收物为燃料时，单位为吨（t）；转化与回收物为燃气时，单位为万立方米（10⁴m³）；转化与回收物为电力时，单位为万千瓦时（10⁴kWh）；转化与回收物为热力时，单位为百万千焦（GJ）。CO₂、CH₄、N₂O 排放因子单位为：t/t燃料或t/10⁴m³燃气。
+        能源加工与转换排放是指为了特定的用途，将某种能源经过一定的工艺加工或转换成另外一种能源的过程中产生的排放。当转化与回收物为燃料时，单位为吨（t）；转化与回收物为燃气时，单位为万立方米（10⁴m³）；转化与回收物为电力时，单位为万千瓦时（10⁴kWh）；转化与回收物为热力时，单位为百万千焦（GJ）。CO₂、CH₄、N₂O
+        排放因子单位为：t/t燃料或t/10⁴m³燃气。
       </div>
-      <el-table :data="tableData" style="width: 100%;" :show-summary="true" :summary-method="summary" border :row-class-name="tableRowClassName">
+      <el-table
+        :data="tableData" style="width: 100%;" :span-method="objectSpanMethod" :show-summary="true" :summary-method="summary" border
+        :row-class-name="tableRowClassName"
+      >
         <el-table-column prop="type" label="类型" align="center" />
         <el-table-column prop="outputMode" label="产出方式" align="center" />
         <el-table-column prop="outputType" label="产出种类" align="center" />
-        <el-table-column prop="amount" label="转化与回收量(单位见说明)" align="center" />
-        <el-table-column prop="consumption" label="消耗量(t/10⁴m³)" align="center">
+        <!-- <el-table-column prop="amount" label="转化与回收量(单位见说明)" align="center" /> -->
+        <el-table-column prop="consumption" label="转化与回收量(单位见说明)" align="center">
           <template #default="scope">
-            <el-input v-model.trim="scope.row.consumption" @input="($event) => { watchConsumption($event, scope.$index) }" />
+            <el-input
+              v-model.trim="scope.row.consumption"
+              @input="($event) => { watchConsumption($event, scope.$index) }"
+            />
           </template>
         </el-table-column>
         <el-table-column label="CO₂" align="center">
           <el-table-column prop="emissionsCO" label="排放量(t)" align="center" />
           <el-table-column prop="emissionFactorCO" label="排放因子" align="left">
             <template #default="scope">
-              <el-select v-model.trim="scope.row.emissionFactorCO" style="width: 100%;" @change="($event) => { emissionFactorCO1($event, scope.$index) }">
+              <el-select
+                v-model.trim="scope.row.emissionFactorCO" style="width: 100%;"
+                @change="($event) => { emissionFactorCO1($event, scope.$index) }"
+              >
                 <el-option label="缺省值" value="1" />
                 <el-option label="自测值" value="2" />
               </el-select>
-              <el-input v-if="scope.row.emissionFactorCO === '2'" v-model="scope.row.emissionFactorCO_value" style="width: 70%;" class="input" @input="($event) => { emissionFactorCO($event, scope.$index) }" />
+              <el-input
+                v-if="scope.row.emissionFactorCO === '2'" v-model="scope.row.emissionFactorCO_value"
+                style="width: 70%;" class="input" @input="($event) => { emissionFactorCO($event, scope.$index) }"
+              />
             </template>
           </el-table-column>
         </el-table-column>
@@ -299,11 +564,17 @@
           <el-table-column prop="emissionsCH" label="排放量(kg)" align="center" />
           <el-table-column prop="emissionFactorCH" label="排放因子" align="left">
             <template #default="scope">
-              <el-select v-model.trim="scope.row.emissionFactorCH" style="width: 100%;" @change="($event) => { emissionFactorCH1($event, scope.$index) }">
+              <el-select
+                v-model.trim="scope.row.emissionFactorCH" style="width: 100%;"
+                @change="($event) => { emissionFactorCH1($event, scope.$index) }"
+              >
                 <el-option label="缺省值" value="1" />
                 <el-option label="自测值" value="2" />
               </el-select>
-              <el-input v-if="scope.row.emissionFactorCH === '2'" v-model="scope.row.emissionFactorCH_value" style="width: 70%;" class="input" @input="($event) => { emissionFactorCH($event, scope.$index) }" />
+              <el-input
+                v-if="scope.row.emissionFactorCH === '2'" v-model="scope.row.emissionFactorCH_value"
+                style="width: 70%;" class="input" @input="($event) => { emissionFactorCH($event, scope.$index) }"
+              />
             </template>
           </el-table-column>
         </el-table-column>
@@ -311,11 +582,17 @@
           <el-table-column prop="emissionsNO" label="排放量(kg)" align="center" />
           <el-table-column prop="emissionFactorNO" label="排放因子" align="left">
             <template #default="scope">
-              <el-select v-model="scope.row.emissionFactorNO" style="width: 100%;" @change="($event) => { emissionFactorNO1($event, scope.$index) }">
+              <el-select
+                v-model="scope.row.emissionFactorNO" style="width: 100%;"
+                @change="($event) => { emissionFactorNO1($event, scope.$index) }"
+              >
                 <el-option label="缺省值" value="1" />
                 <el-option label="自测值" value="2" />
               </el-select>
-              <el-input v-if="scope.row.emissionFactorNO === '2'" v-model="scope.row.emissionFactorNO_value" style="width: 70%;" class="input" @input="($event) => { emissionFactorNO($event, scope.$index) }" />
+              <el-input
+                v-if="scope.row.emissionFactorNO === '2'" v-model="scope.row.emissionFactorNO_value"
+                style="width: 70%;" class="input" @input="($event) => { emissionFactorNO($event, scope.$index) }"
+              />
             </template>
           </el-table-column>
         </el-table-column>
@@ -331,7 +608,10 @@
       <!-- 添加燃烧能源 -->
       <el-dialog v-model="dialogTableVisible" title="添加燃烧能源">
         <div class="container">
-          <div v-for="item in countParams" :key="item.type" class="item" :class="isSelect(item) ? 'item-select' : 'item-noselect'" @click="handler(item)">
+          <div
+            v-for="item in countParams" :key="item.type" class="item"
+            :class="isSelect(item) ? 'item-select' : 'item-noselect'" @click="handler(item)"
+          >
             {{ item.type }}
           </div>
         </div>
diff --git a/src/views/count/list.vue b/src/views/count/list.vue
index 2e5cb8c..9afc21f 100644
--- a/src/views/count/list.vue
+++ b/src/views/count/list.vue
@@ -15,9 +15,9 @@
         title: '能源转换加工',
         point: 'energyProcessing',
       },
-      {
-        title: '工艺排放',
-      },
+      // {
+      //   title: '工艺排放',
+      // },
     ],
   },
   {
diff --git a/src/views/count/table.vue b/src/views/count/table.vue
index 28920a4..94ccf87 100644
--- a/src/views/count/table.vue
+++ b/src/views/count/table.vue
@@ -54,9 +54,9 @@
   const energyData = energyRef.value.sumArr
   const value3 = {
     name: '能源加工转换',
-    co: 0,
-    ch: 0,
-    no: 0,
+    co: energyData[4],
+    ch: energyData[6],
+    no: energyData[8],
   }
   sessionStorage.setItem('能源加工转换', JSON.stringify(value3))
   // 购入热力
diff --git a/src/views/data/environment/page.vue b/src/views/data/environment/page.vue
index 6ad5c77..fcef02b 100644
--- a/src/views/data/environment/page.vue
+++ b/src/views/data/environment/page.vue
@@ -122,8 +122,8 @@
           type="datetimerange"
           format="YYYY-MM-DD" value-format="YYYY-MM-DD"
           range-separator="至"
-          start-placeholder="上传开始时间"
-          end-placeholder="上传结束时间"
+          start-placeholder="采集开始时间"
+          end-placeholder="采集结束时间"
           clearable
         />
       </search-item>