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="yearTotalGasInjection"
+                prop="wellTotalGasInjection"
                 :formatter="gasInjectionFormatter"
                 :min-width="columnWidths.totalGasInjection.width"
                 resizable
@@ -325,14 +325,14 @@
               <el-table-column
                 label="注水量(方)"
                 align="center"
-                prop="yearTotalWaterInjection"
+                prop="wellTotalWaterInjection"
                 :min-width="columnWidths.totalWaterInjection.width"
                 resizable
               />
               <el-table-column
                 label="用电量(万千瓦时)"
                 align="center"
-                prop="yearTotalPower"
+                prop="wellTotalPower"
                 :formatter="gasInjectionFormatter"
                 :min-width="columnWidths.yearTotalPower.width"
                 resizable
@@ -340,16 +340,16 @@
               <el-table-column
                 label="油耗(L)"
                 align="center"
-                prop="yearTotalFuel"
+                prop="wellTotalFuel"
                 :min-width="columnWidths.cumulativeCompletion.width"
                 resizable
               />
             </el-table-column>
-            <el-table-column label="井累计" align="center">
+            <el-table-column label="年累计" align="center">
               <el-table-column
                 label="注气量(万方)"
                 align="center"
-                prop="wellTotalGasInjection"
+                prop="yearTotalGasInjection"
                 :formatter="gasInjectionFormatter"
                 :min-width="columnWidths.totalGasInjection.width"
                 resizable
@@ -357,14 +357,14 @@
               <el-table-column
                 label="注水量(方)"
                 align="center"
-                prop="wellTotalWaterInjection"
+                prop="yearTotalWaterInjection"
                 :min-width="columnWidths.totalWaterInjection.width"
                 resizable
               />
               <el-table-column
                 label="用电量(万千瓦时)"
                 align="center"
-                prop="wellTotalPower"
+                prop="yearTotalPower"
                 :formatter="gasInjectionFormatter"
                 :min-width="columnWidths.yearTotalPower.width"
                 resizable
@@ -372,7 +372,7 @@
               <el-table-column
                 label="油耗(L)"
                 align="center"
-                prop="wellTotalFuel"
+                prop="yearTotalFuel"
                 :min-width="columnWidths.cumulativeCompletion.width"
                 resizable
               />

src/views/pms/stat/rhkb.vue

@@ -169,6 +169,12 @@
               label="施工天数"
               align="center"
             />
+            <el-table-column
+              prop="gasInjection"
+              :formatter="gasInjectionFormatter"
+              label="注气量(万方)"
+              align="center"
+            />
             <el-table-column
               prop="utilizationRate"
               label="设备利用率"
@@ -335,6 +341,14 @@ const formatRate = (row) => {
   return (row.utilizationRate * 100).toFixed(2) + '%'
 }
 
+// 注气量格式化函数（单位转换：方 -> 万方）
+const gasInjectionFormatter = (row: any, column: any, cellValue: any, index: number | null) => {
+  if (cellValue === null || cellValue === undefined || cellValue === '') return ''
+  // 将方转换为万方，保留两位小数
+  const value = parseFloat(cellValue)
+  return (value / 10000).toFixed(2)
+}
+
 const by = ref({
   todo: undefined,
   finished: undefined