#146 5#国日报调整

Scalone
yanghao scala 3 commity/ów z shuzhihua/qhse_file do shuzhihua/master 1 dzień temu

+ 10 - 1
src/views/pms/constructionDailyReport/index.vue

@@ -3,6 +3,7 @@ import { FiveIotProjectDailyReportApi } from '@/api/pms/fiveconstructiondailyrep
 import { useUserStore } from '@/store/modules/user'
 import { rangeShortcuts } from '@/utils/formatTime'
 import { useDebounceFn } from '@vueuse/core'
+import dayjs from 'dayjs'
 import ConstructionDailyReportDrawer from './components/ConstructionDailyReportDrawer.vue'
 import ConstructionDailyReportTable from './components/ConstructionDailyReportTable.vue'
 import type {
@@ -40,13 +41,21 @@ const resolveCreateTimeFromRoute = () => {
   return undefined
 }
 
+const getDefaultCreateTime = (): string[] => {
+  const yesterday = dayjs().subtract(1, 'day')
+  return [
+    yesterday.startOf('day').format('YYYY-MM-DD HH:mm:ss'),
+    yesterday.endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  ]
+}
+
 const createDefaultQuery = (): ConstructionDailyReportQuery => ({
   pageNo: 1,
   pageSize: 10,
   deptId: parseQueryNumber(route.query.deptId) ?? deptId,
   projectDeptId: parseQueryNumber(route.query.projectDeptId),
   teamId: parseQueryNumber(route.query.teamId),
-  createTime: resolveCreateTimeFromRoute()
+  createTime: resolveCreateTimeFromRoute() ?? getDefaultCreateTime()
 })
 
 const query = ref<ConstructionDailyReportQuery>(createDefaultQuery())

+ 4 - 2
src/views/pms/fiveDailyReportSummary/index.vue

@@ -137,7 +137,7 @@ const loadSummary = useDebounceFn(async () => {
       totalDailyFuel: data?.totalDailyFuel || 0,
       cumulativeMixSand: data?.cumulativeMixSand || 0,
       cumulativeLiquidVolume: data?.cumulativeLiquidVolume || 0,
-      utilizationRate: Number(data?.utilizationRate || 0)
+      utilizationRate: Number(data?.utilizationRate || 0) * 100
     }
   } finally {
     summaryLoading.value = false
@@ -177,7 +177,9 @@ function handleCurrentChange(value) {
 
 function formatCellValue(row, prop) {
   if (prop === 'utilizationRate') {
-    return row[prop] === null || row[prop] === undefined ? '-' : `${Number(row[prop]).toFixed(2)}%`
+    return row[prop] === null || row[prop] === undefined
+      ? '-'
+      : `${(Number(row[prop]) * 100).toFixed(2)}%`
   }
 
   const value = row[prop]