This commit is contained in:
yin 2026-07-31 18:16:07 +08:00
commit 1827ea30de
6 changed files with 180 additions and 5 deletions

View File

@ -50,6 +50,9 @@ export function create(data: {
model?: string
serial_number?: string
stream_type?: string
custom_name?: string
status?: number
remark?: string
}) {
return request({
url: '/system',
@ -80,6 +83,9 @@ export function update(data: {
model?: string
serial_number?: string
stream_type?: string
custom_name?: string
status?: number
remark?: string
}) {
return request({
url: '/system',
@ -128,3 +134,23 @@ export function del(data: { id: number }) {
isSystemApi: true
} as any)
}
/** 设置摄像头 OSD 文字叠加 */
export function setOsd(data: {
id: number
text: string
x?: number
y?: number
}) {
return request({
url: '/system',
method: 'post',
params: {
method: 'camera.setOsd',
v,
timestamp: new Date().getTime()
},
data,
isSystemApi: true
} as any)
}

View File

@ -137,6 +137,26 @@ export function formatTime(value: any): string {
}
}
/** 计算打包时长(结束时间 - 开始时间),返回格式化字符串 */
export function calcPackDuration(startTime: any, endTime: any): string {
if (!startTime || !endTime) return '—'
try {
const start = new Date(startTime)
const end = new Date(endTime)
if (isNaN(start.getTime()) || isNaN(end.getTime())) return '—'
const diff = end.getTime() - start.getTime()
if (diff < 0) return '—'
const hours = Math.floor(diff / 3600000)
const minutes = Math.floor((diff % 3600000) / 60000)
const seconds = Math.floor((diff % 60000) / 1000)
if (hours > 0) return `${hours}小时${minutes}分${seconds}秒`
if (minutes > 0) return `${minutes}分${seconds}秒`
return `${seconds}秒`
} catch {
return '—'
}
}
// ============================================================
// TAG_RESOLVERS — 标签颜色解析器
// ============================================================
@ -250,6 +270,14 @@ export const FIELD_DICT: Record<string, FieldDefinition> = {
slot: { type: 'text', format: 'datetime' },
detailLabel: '结束时间'
},
pack_duration: {
key: 'pack_duration',
label: '打包时长',
scanBox: null,
table: { width: 120, align: 'center' },
slot: { type: 'text' },
detailLabel: '打包时长'
},
create_time: {
key: 'create_time',
label: '创建时间',
@ -671,7 +699,7 @@ export const tabPages: TabPageRawConfig[] = [
tableColumnKeys: [
'id', 'order_id', 'waybill_code', 'wave_no', 'operator_text',
'workbench_name', 'pack_quantity', 'pack_mode', 'status',
'start_time', 'end_time', 'create_time', 'videos'
'start_time', 'end_time', 'pack_duration', 'create_time', 'videos'
],
upperTableDefaults: {
title: '打包任务列表',
@ -691,7 +719,7 @@ export const tabPages: TabPageRawConfig[] = [
{
title: '时间信息',
columnCount: 2,
fieldKeys: ['start_time', 'end_time', 'create_time']
fieldKeys: ['start_time', 'end_time', 'pack_duration', 'create_time']
}
],
api: {
@ -702,7 +730,8 @@ export const tabPages: TabPageRawConfig[] = [
if (!codeOk) throw new Error(res.message || '查询失败')
const list = (res.data?.list ?? []).map((item: any) => ({
...item,
waybill_code: extractWaybillCode(item)
waybill_code: extractWaybillCode(item),
pack_duration: calcPackDuration(item.start_time, item.end_time)
}))
return {
list,

View File

@ -120,6 +120,20 @@ export const packingColumns = [
{ prop: 'status', label: '任务状态', width: 100 },
{ prop: 'start_time', label: '开始时间', width: 170, sortable: true, formatter: (row: any) => row.start_time ? dayjs(row.start_time).format('YYYY-MM-DD HH:mm:ss') : '—' },
{ prop: 'end_time', label: '结束时间', width: 170, sortable: true, formatter: (row: any) => row.end_time ? dayjs(row.end_time).format('YYYY-MM-DD HH:mm:ss') : '—' },
{ prop: 'pack_duration', label: '打包时长', width: 120, formatter: (row: any) => {
if (!row.start_time || !row.end_time) return '—'
const start = dayjs(row.start_time)
const end = dayjs(row.end_time)
if (!start.isValid() || !end.isValid()) return '—'
const diff = end.diff(start)
if (diff < 0) return '—'
const hours = Math.floor(diff / 3600000)
const minutes = Math.floor((diff % 3600000) / 60000)
const seconds = Math.floor((diff % 60000) / 1000)
if (hours > 0) return `${hours}小时${minutes}分${seconds}秒`
if (minutes > 0) return `${minutes}分${seconds}秒`
return `${seconds}秒`
}},
{ prop: 'create_time', label: '创建时间', width: 170, sortable: true, formatter: (row: any) => row.create_time ? dayjs(row.create_time).format('YYYY-MM-DD HH:mm:ss') : '—' },
{ prop: 'update_time', label: '更新时间', width: 170, sortable: true, formatter: (row: any) => row.update_time ? dayjs(row.update_time).format('YYYY-MM-DD HH:mm:ss') : '—' },
{ prop: 'express_info', label: '快递信息', minWidth: 140, formatter: (row: any) => getExpressInfo(row) },

View File

@ -1056,8 +1056,14 @@ function stripRedundantPrintFields(waveGroups: unknown[]): unknown[] {
return { ...o, contents }
})
: p.orders
// 保留 platform 层的所有字段(包括 order_ids、platform_name、sys_logistics_name、order_count)
return { ...p, orders }
const {
platform_name: _pn,
sys_logistics_name: _sln,
order_count: _oc,
order_ids: _oi,
...restPlatform
} = p
return { ...restPlatform, orders }
})
: wg.platforms
return { ...wg, platforms }

View File

@ -28,6 +28,25 @@
<div v-else class="preview-placeholder">
{{ loading ? '正在获取流地址…' : streamSrc ? '正在连接录像机…' : '正在连接…' }}
</div>
<!-- OSD 文字叠加设置 -->
<div v-if="streamReady && cameraRow?.id" class="osd-controls">
<div class="osd-title">OSD 文字叠加</div>
<el-form :inline="true" size="small" class="osd-form">
<el-form-item label="文字">
<el-input v-model="osdText" placeholder="输入叠加文字" maxlength="50" style="width: 160px" />
</el-form-item>
<el-form-item label="X">
<el-input-number v-model="osdX" :min="-1" :max="1" :step="0.1" :precision="1" style="width: 100px" />
</el-form-item>
<el-form-item label="Y">
<el-input-number v-model="osdY" :min="-1" :max="1" :step="0.1" :precision="1" style="width: 100px" />
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" :loading="osdLoading" @click="handleSetOsd">设置 OSD</el-button>
</el-form-item>
</el-form>
</div>
</div>
<template #footer>
<el-button @click="onDialogVisibleChange(false)">关闭</el-button>
@ -38,8 +57,10 @@
<script setup lang="ts">
import { ref, computed, watch } from 'vue'
import { ElMessage } from 'element-plus'
import { getLiveStreamUrl } from '@/api/camera_server/localServerApi'
import { list as serverList, detail as serverDetail } from '@/api/camera_server/camera_server'
import { setOsd } from '@/api/camera/camera'
export interface CameraPreviewRow {
id?: number
@ -71,6 +92,12 @@ let probeAbort: AbortController | null = null
/** 是否已尝试过公网 IP 回退 */
let triedPublic = false
// ---- OSD ----
const osdText = ref('')
const osdX = ref(-0.9)
const osdY = ref(0.8)
const osdLoading = ref(false)
const nvrIp = ref('')
const nvrPort = ref<number | undefined>(undefined)
const nvrUser = ref('')
@ -241,6 +268,36 @@ function handleClosed() {
streamReady.value = false
nvrIp.value = ''
nvrPort.value = undefined
osdText.value = ''
osdX.value = -0.9
osdY.value = 0.8
}
async function handleSetOsd() {
const row = props.cameraRow
if (!row?.id) return
if (!osdText.value.trim()) {
ElMessage.warning('请输入 OSD 文字')
return
}
osdLoading.value = true
try {
const res: any = await setOsd({
id: row.id,
text: osdText.value.trim(),
x: osdX.value,
y: osdY.value
})
if (ok(res)) {
ElMessage.success('OSD 设置成功')
} else {
ElMessage.error(res?.message || 'OSD 设置失败')
}
} catch {
ElMessage.error('OSD 设置失败')
} finally {
osdLoading.value = false
}
}
watch(() => props.modelValue, (v) => {
@ -277,6 +334,29 @@ watch(() => props.modelValue, (v) => {
color: #e6a23c;
background: #fdf6ec;
}
.osd-controls {
margin-top: 16px;
padding: 12px 16px;
border: 1px solid #ebeef5;
border-radius: 4px;
background: #fafafa;
}
.osd-title {
font-size: 14px;
font-weight: 600;
color: #303133;
margin-bottom: 10px;
}
.osd-form {
display: flex;
align-items: flex-end;
flex-wrap: wrap;
gap: 4px;
}
.osd-form :deep(.el-form-item) {
margin-bottom: 0;
margin-right: 8px;
}
.preview-error {
display: flex;
flex-direction: column;

View File

@ -91,6 +91,14 @@
<el-input v-model="form.stream_type" placeholder="选择通道后自动填充" disabled />
</el-form-item>
<el-form-item label="用户名">
<el-input v-model="form.username" placeholder="请输入用户名" maxlength="100" show-word-limit />
</el-form-item>
<el-form-item label="密码">
<el-input v-model="form.password" type="password" placeholder="请输入密码" show-password maxlength="100" />
</el-form-item>
<el-form-item label="自定义名称" prop="custom_name">
<el-input v-model="form.custom_name" placeholder="请输入自定义名称" maxlength="100" show-word-limit />
</el-form-item>
@ -185,6 +193,8 @@ const form = reactive({
model: '',
serial_number: '',
stream_type: '',
username: 'admin',
password: '',
custom_name: '',
status: 1 as number,
remark: ''
@ -208,6 +218,8 @@ function resetForm() {
form.model = ''
form.serial_number = ''
form.stream_type = ''
form.username = 'admin'
form.password = ''
form.custom_name = ''
form.status = 1
form.remark = ''
@ -231,6 +243,8 @@ function populateFromRow(row: Record<string, any>) {
form.model = row.model || ''
form.serial_number = row.serial_number || ''
form.stream_type = row.stream_type || ''
form.username = row.username || 'admin'
form.password = row.password || ''
form.custom_name = row.custom_name || ''
form.status = row.status ?? 1
form.remark = row.remark || ''
@ -390,6 +404,8 @@ watch(() => form.server_id, (newId, oldId) => {
form.model = ''
form.serial_number = ''
form.stream_type = ''
form.username = 'admin'
form.password = ''
channelOptions.value = []
selectedServerNeedsPassword.value = false
serverPassword.value = ''
@ -417,6 +433,8 @@ async function handleSubmit() {
model: form.model.trim() || undefined,
serial_number: form.serial_number.trim() || undefined,
stream_type: form.stream_type.trim() || undefined,
username: form.username.trim() || undefined,
password: form.password.trim() || undefined,
custom_name: form.custom_name.trim() || undefined,
status: form.status,
remark: form.remark.trim() || undefined
@ -436,6 +454,8 @@ async function handleSubmit() {
model: form.model.trim() || undefined,
serial_number: form.serial_number.trim() || undefined,
stream_type: form.stream_type.trim() || undefined,
username: form.username.trim() || undefined,
password: form.password.trim() || undefined,
custom_name: form.custom_name.trim() || undefined,
status: form.status,
remark: form.remark.trim() || undefined