Merge branch 'master' of http://1.94.244.160:3000/shuzhihua/pms-iot-vue

src/views/pms/iotrhdailyreport/index.vue

@@ -246,6 +246,13 @@
                 :min-width="columnWidths.dailyPowerUsage.width"
                 resizable
               />
+              <el-table-column
+                label="油耗(L)"
+                align="center"
+                prop="dailyOilUsage"
+                :min-width="columnWidths.dailyOilUsage.width"
+                resizable
+              />
             </el-table-column>
             <el-table-column
               label="非生产时间(H)"
@@ -625,6 +632,11 @@ const columnWidths = ref<
     prop: 'dailyPowerUsage',
     width: '120px'
   },
+  dailyOilUsage: {
+    label: '油耗(L)',
+    prop: 'dailyOilUsage',
+    width: '120px'
+  },
   nonProductionTime: {
     label: '非生产时间(H)',
     prop: 'nonProductionTime',

src/views/pms/iotrhdailyreport/summary.vue

@@ -130,7 +130,7 @@ const totalWorkKeys = [
   ['notReported', '个', '未填报', 'i-material-symbols:cancel-outline-rounded text-rose'],
   [
     'totalFuelConsumption',
-    '吨',
+    'L',
     '累计油耗',
     'i-material-symbols:directions-car-outline-rounded text-sky'
   ],
@@ -226,7 +226,7 @@ const columns = (type: string) => {
       prop: 'cumulativePowerConsumption'
     },
     {
-      label: '累计油耗(吨)',
+      label: '累计油耗(L)',
       prop: 'cumulativeFuelConsumption'
     }
   ]