|
|
|
@ -265,7 +265,7 @@ v-else direction="vertical" class="device-ledger-history-steps"
|
|
|
|
<div class="device-ledger-history-item-row">
|
|
|
|
<div class="device-ledger-history-item-row">
|
|
|
|
<span class="device-ledger-history-item-label">保养时间</span>
|
|
|
|
<span class="device-ledger-history-item-label">保养时间</span>
|
|
|
|
<span class="device-ledger-history-item-value">
|
|
|
|
<span class="device-ledger-history-item-value">
|
|
|
|
{{ String(formatHistoryTime(item.taskTime)).split(' ')[0] }}
|
|
|
|
{{ String(formatHistoryTime(item.taskTime))}}
|
|
|
|
</span>
|
|
|
|
</span>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<div class="device-ledger-history-item-row">
|
|
|
|
<div class="device-ledger-history-item-row">
|
|
|
|
@ -525,7 +525,7 @@ type HistoryStepItem = {
|
|
|
|
criteria?: any
|
|
|
|
criteria?: any
|
|
|
|
images?: string[]
|
|
|
|
images?: string[]
|
|
|
|
remark?: any
|
|
|
|
remark?: any
|
|
|
|
inspectionTime?: any
|
|
|
|
taskTime?: any
|
|
|
|
createTime?: any
|
|
|
|
createTime?: any
|
|
|
|
}
|
|
|
|
}
|
|
|
|
type HistoryStepGroup = { key: string; time: string; operator: string; items: HistoryStepItem[] }
|
|
|
|
type HistoryStepGroup = { key: string; time: string; operator: string; items: HistoryStepItem[] }
|
|
|
|
@ -534,7 +534,7 @@ const buildStepGroups = (rows: any[], options: { timeField: string; nameFieldCan
|
|
|
|
const groups = new Map<string, HistoryStepGroup>()
|
|
|
|
const groups = new Map<string, HistoryStepGroup>()
|
|
|
|
|
|
|
|
|
|
|
|
for (const row of rows ?? []) {
|
|
|
|
for (const row of rows ?? []) {
|
|
|
|
const time = formatHistoryTime(row?.[options.timeField] ?? row?.createTime)
|
|
|
|
const time = formatHistoryTime(row?.taskTime ?? row?.[options.timeField] ?? row?.createTime)
|
|
|
|
const operator = String(row?.operator ?? row?.creatorName ?? row?.creator ?? '-')
|
|
|
|
const operator = String(row?.operator ?? row?.creatorName ?? row?.creator ?? '-')
|
|
|
|
const groupKey = `${row?.managementId ?? ''}__${time}__${operator}`
|
|
|
|
const groupKey = `${row?.managementId ?? ''}__${time}__${operator}`
|
|
|
|
|
|
|
|
|
|
|
|
|