From b95cf940af8e01e4eca30b2599b029c2f645bd1e Mon Sep 17 00:00:00 2001
From: charles <981744753@qq.com>
Date: 星期一, 29 四月 2024 10:44:26 +0800
Subject: [PATCH] feat:创建新分支
---
src/views/dashboard/components/ReportingRecordModal.vue | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/src/views/dashboard/components/ReportingRecordModal.vue b/src/views/dashboard/components/ReportingRecordModal.vue
index 04e06b7..136fbb8 100644
--- a/src/views/dashboard/components/ReportingRecordModal.vue
+++ b/src/views/dashboard/components/ReportingRecordModal.vue
@@ -11,14 +11,15 @@
</template>
<div class="table-content">
<el-table class="table" :data="reportingRecordList" border style="width: 100%" :scrollbar-always-on="true">
+ <template #empty> 鏃犳暟鎹� </template>
<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="workerName" label="浜哄憳濮撳悕" align="center" :resizable="false" />
+ <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 +32,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 +49,7 @@
import { apiGetReportingRecordList } from '@/api'
import type { ReportingRecord } from '@/api/reporting'
import { useTasksStore } from '@/stores/tasks'
+import { isNumber } from 'lodash-es'
export interface BaseModalProps {
/** 鏄惁灞曠ず妯℃�佹 */
@@ -73,7 +78,7 @@
return
}
apiGetReportingRecordList({
- procedureId: procedureId
+ workOrderProcedureID: procedureId
})
.then((res) => {
if (res.code === 200) {
@@ -105,6 +110,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