pms 瑞恒日报列表 添加 年累计 井累计

src/views/pms/iotrhdailyreport/index.vue

@@ -313,11 +313,11 @@
               :min-width="columnWidths.contractName.width"
               resizable
             />
-            <el-table-column label="累计" align="center">
+            <el-table-column label="年累计" align="center">
               <el-table-column
                 label="注气量(万方)"
                 align="center"
-                prop="totalGasInjection"
+                prop="yearTotalGasInjection"
                 :formatter="gasInjectionFormatter"
                 :min-width="columnWidths.totalGasInjection.width"
                 resizable
@@ -325,14 +325,54 @@
               <el-table-column
                 label="注水量(方)"
                 align="center"
-                prop="totalWaterInjection"
+                prop="yearTotalWaterInjection"
                 :min-width="columnWidths.totalWaterInjection.width"
                 resizable
               />
               <el-table-column
-                label="完工井次"
+                label="用电量(万千瓦时)"
                 align="center"
-                prop="cumulativeCompletion"
+                prop="yearTotalPower"
+                :formatter="gasInjectionFormatter"
+                :min-width="columnWidths.yearTotalPower.width"
+                resizable
+              />
+              <el-table-column
+                label="油耗(L)"
+                align="center"
+                prop="yearTotalFuel"
+                :min-width="columnWidths.cumulativeCompletion.width"
+                resizable
+              />
+            </el-table-column>
+            <el-table-column label="井累计" align="center">
+              <el-table-column
+                label="注气量(万方)"
+                align="center"
+                prop="wellTotalGasInjection"
+                :formatter="gasInjectionFormatter"
+                :min-width="columnWidths.totalGasInjection.width"
+                resizable
+              />
+              <el-table-column
+                label="注水量(方)"
+                align="center"
+                prop="wellTotalWaterInjection"
+                :min-width="columnWidths.totalWaterInjection.width"
+                resizable
+              />
+              <el-table-column
+                label="用电量(万千瓦时)"
+                align="center"
+                prop="wellTotalPower"
+                :formatter="gasInjectionFormatter"
+                :min-width="columnWidths.yearTotalPower.width"
+                resizable
+              />
+              <el-table-column
+                label="油耗(L)"
+                align="center"
+                prop="wellTotalFuel"
                 :min-width="columnWidths.cumulativeCompletion.width"
                 resizable
               />
@@ -603,6 +643,11 @@ const columnWidths = ref<
     prop: 'totalWaterInjection',
     width: '120px'
   },
+  yearTotalPower: {
+    label: '用电量(万千瓦时)',
+    prop: 'yearTotalPower',
+    width: '120px'
+  },
   cumulativeCompletion: {
     label: '完工井次',
     prop: 'cumulativeCompletion',