From 757ebcbdb3aa024793892a19606dff382ea3820e Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期一, 27 十一月 2023 17:46:34 +0800
Subject: [PATCH] feat: 对接口
---
src/api/reporting.ts | 3 +++
src/views/dashboard/components/ReportingRecordModal.vue | 28 +++++++++++++++++++++++-----
2 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/src/api/reporting.ts b/src/api/reporting.ts
index a13dc3e..f00e8a6 100644
--- a/src/api/reporting.ts
+++ b/src/api/reporting.ts
@@ -1,6 +1,7 @@
// 鎶ュ伐璁板綍
export interface ReportingRecord {
ID: number
+ barCode: string
CreatedAt: string
UpdatedAt: string
DeletedAt: string
@@ -16,4 +17,6 @@
finishAmount: number
workerID: string
workerName: string
+ /** 宸ユ椂, 鍗曚綅绉� */
+ workerTime: number
}
diff --git a/src/views/dashboard/components/ReportingRecordModal.vue b/src/views/dashboard/components/ReportingRecordModal.vue
index 04e06b7..217d2f6 100644
--- a/src/views/dashboard/components/ReportingRecordModal.vue
+++ b/src/views/dashboard/components/ReportingRecordModal.vue
@@ -14,11 +14,10 @@
<el-table-column type="index" label="搴忓彿" width="56" align="center" :resizable="false"></el-table-column>
<el-table-column prop="deviceId" label="鎶ュ伐鏉ユ簮" align="center" :resizable="false">
<template #default="scope">
- {{ scope?.row?.workerName ?? '' }}/{{ scope?.row?.deviceName ?? '' }}
+ {{ scope?.row?.workerName ?? '--' }}/{{ scope?.row?.deviceName ?? '--' }}
</template>
</el-table-column>
- <!-- TODO: 鏉＄爜瀛楁杩樻病鍔� -->
- <el-table-column prop="xxx" label="鏉＄爜" align="center" :resizable="false">鏉＄爜</el-table-column>
+ <el-table-column prop="barCode" label="鏉＄爜" align="center" :resizable="false">鏉＄爜</el-table-column>
<el-table-column prop="reportAmount" label="鎶ュ伐鏁伴噺" align="center" :resizable="false" />
<el-table-column prop="finishAmount" label="瀹屾垚鏁伴噺" align="center" :resizable="false" />
<el-table-column prop="startTime" label="寮�濮嬫椂闂�" align="center" :resizable="false">
@@ -31,8 +30,11 @@
{{ formatDate(scope.row.endTime) }}
</template>
</el-table-column>
- <!-- TODO: 宸ユ椂瀛楁杩樻病鍔�-->
- <el-table-column prop="xxx" label="宸ユ椂" align="center" :resizable="false" />
+ <el-table-column prop="workerTime" label="宸ユ椂" align="center" :resizable="false">
+ <template #default="scope">
+ {{ formatDuration(scope.row.workerTime) }}
+ </template>
+ </el-table-column>
</el-table>
</div>
</el-dialog>
@@ -45,6 +47,7 @@
import { apiGetReportingRecordList } from '@/api'
import type { ReportingRecord } from '@/api/reporting'
import { useTasksStore } from '@/stores/tasks'
+import { isNumber } from 'lodash-es'
export interface BaseModalProps {
/** 鏄惁灞曠ず妯℃�佹 */
@@ -105,6 +108,21 @@
const time = useDateFormat(timestamp * 1000, 'YYYY-MM-DD HH:mm:ss', { locales: 'zh-cn' })
return time.value
}
+
+/**
+ * 鎺ュ彈绉掓暟,杩斿洖鏍煎紡鍖栧悗鐨� 鏃跺垎绉掑瓧绗︿覆
+ * @param duration 绉掓暟
+ * @returns {string} 鏍煎紡鍖栧悗鐨� 鏃跺垎绉掑瓧绗︿覆
+ */
+function formatDuration(duration: number): string {
+ if (duration < 0 || !isNumber(duration)) {
+ return '--'
+ }
+ const h = Math.floor(duration / 3600)
+ const m = Math.floor((duration % 3600) / 60)
+ const s = Math.floor(duration % 60)
+ return `${h > 0 ? h + '鏃�' : ''}${m > 0 ? m + '鍒嗛挓' : ''}${s}绉抈
+}
</script>
<style scoped lang="scss">
--
Gitblit v1.8.0