Переглянути джерело

🦄 refactor(日报): 部份调整

Zimo 2 днів тому
батько
коміт
6e824d00d1

+ 7 - 1
src/views/pms/iotrhdailyreport/summary.vue

@@ -150,6 +150,10 @@ const columns = (type: string) => {
     {
       label: '累计油耗(L)',
       prop: 'cumulativeFuelConsumption'
+    },
+    {
+      label: '平均时效(%)',
+      prop: 'transitTime'
     }
   ]
 }
@@ -157,7 +161,9 @@ const columns = (type: string) => {
 const listLoading = ref(false)
 
 const formatter = (row: List, column: any) => {
-  return row[column.property] ?? 0
+  if (column.property === 'transitTime') {
+    return (Number(row.transitTime ?? 0) * 100).toFixed(2) + '%'
+  } else return row[column.property] ?? 0
 }
 
 const getList = useDebounceFn(async () => {

+ 1 - 1
src/views/pms/iotrydailyreport/approval.vue

@@ -446,7 +446,7 @@ const query = ref<Query>({
   pageSize: 10,
   deptId: id,
   createTime: [
-    ...rangeShortcuts[3].value().map((item) => dayjs(item).format('YYYY-MM-DD HH:mm:ss'))
+    ...rangeShortcuts[2].value().map((item) => dayjs(item).format('YYYY-MM-DD HH:mm:ss'))
   ],
   projectClassification: '1'
 })

+ 7 - 1
src/views/pms/iotrydailyreport/summary.vue

@@ -140,6 +140,10 @@ const columns = (type: string) => {
     {
       label: '累计油耗(吨)',
       prop: 'cumulativeFuelConsumption'
+    },
+    {
+      label: '平均时效(%)',
+      prop: 'transitTime'
     }
   ]
 }
@@ -147,7 +151,9 @@ const columns = (type: string) => {
 const listLoading = ref(false)
 
 const formatter = (row: List, column: any) => {
-  return row[column.property] ?? 0
+  if (column.property === 'transitTime') {
+    return (Number(row.transitTime ?? 0) * 100).toFixed(2) + '%'
+  } else return row[column.property] ?? 0
 }
 
 const getList = useDebounceFn(async () => {

+ 1 - 1
src/views/pms/iotrydailyreport/xapproval.vue

@@ -356,7 +356,7 @@ const query = ref<Query>({
   pageSize: 10,
   deptId: id,
   createTime: [
-    ...rangeShortcuts[3].value().map((item) => dayjs(item).format('YYYY-MM-DD HH:mm:ss'))
+    ...rangeShortcuts[2].value().map((item) => dayjs(item).format('YYYY-MM-DD HH:mm:ss'))
   ],
   projectClassification: '2'
 })

+ 1 - 1
src/views/pms/iotrydailyreport/xfill.vue

@@ -356,7 +356,7 @@ const query = ref<Query>({
   pageSize: 10,
   deptId: id,
   createTime: [
-    ...rangeShortcuts[3].value().map((item) => dayjs(item).format('YYYY-MM-DD HH:mm:ss'))
+    ...rangeShortcuts[2].value().map((item) => dayjs(item).format('YYYY-MM-DD HH:mm:ss'))
   ],
   projectClassification: '2'
 })

+ 7 - 1
src/views/pms/iotrydailyreport/xsummary.vue

@@ -146,6 +146,10 @@ const columns = (type: string) => {
     {
       label: '累计油耗(吨)',
       prop: 'cumulativeFuelConsumption'
+    },
+    {
+      label: '平均时效(%)',
+      prop: 'transitTime'
     }
   ]
 }
@@ -153,7 +157,9 @@ const columns = (type: string) => {
 const listLoading = ref(false)
 
 const formatter = (row: List, column: any) => {
-  return row[column.property] ?? 0
+  if (column.property === 'transitTime') {
+    return (Number(row.transitTime ?? 0) * 100).toFixed(2) + '%'
+  } else return row[column.property] ?? 0
 }
 
 const getList = useDebounceFn(async () => {