Compare commits

...

11 Commits

@ -52,5 +52,13 @@ export const MoldRepairApi = {
getMoldRepairLineListByRepairId: async (repairId) => { getMoldRepairLineListByRepairId: async (repairId) => {
return await request.get({ url: `/mes/mold-repair/mold-repair-line/list-by-repair-id?repairId=` + repairId }) return await request.get({ url: `/mes/mold-repair/mold-repair-line/list-by-repair-id?repairId=` + repairId })
},
getRepairListByMoldId: async (params: { moldId: number; startTime?: string; endTime?: string }) => {
return await request.get({ url: `/mes/mold-repair/getRepairListByMoldId`, params })
},
exportRepairExcel: async (params: { moldId: number; startTime?: string; endTime?: string }) => {
return await request.download({ url: `/mes/mold-repair/export-repair-excel`, params })
} }
} }

@ -47,5 +47,21 @@ export const TicketManagementApi = {
batchUpdateTicketResults: async (data: TicketResultVO[]) => { batchUpdateTicketResults: async (data: TicketResultVO[]) => {
return await request.put({ url: `/mes/mold-ticket-results/batchUpdate`, data }) return await request.put({ url: `/mes/mold-ticket-results/batchUpdate`, data })
},
getInspectionByMoldId: async (params: { moldId: number; startTime?: string; endTime?: string }) => {
return await request.get({ url: `/mes/mold-ticket-management/getInspectionByMoldId`, params })
},
exportInspection: async (params: { moldId: number; startTime?: string; endTime?: string }) => {
return await request.download({ url: `/mes/mold-ticket-management/export-excel-inspection`, params })
},
getMaintenanceByMoldId: async (params: { moldId: number; startTime?: string; endTime?: string }) => {
return await request.get({ url: `/mes/mold-ticket-management/getMaintenanceByMoldId`, params })
},
exportMaintenance: async (params: { moldId: number; startTime?: string; endTime?: string }) => {
return await request.download({ url: `/mes/mold-ticket-management/export-excel-maintenance`, params })
} }
} }

@ -234,8 +234,8 @@ const emitUpdateModelValue = () => {
.ellipsis-text { .ellipsis-text {
display: inline-block; display: inline-block;
max-width: 100px; max-width: 100px;
white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap;
} }
</style> </style>

@ -579,6 +579,25 @@ const remainingRouter: AppRouteRecordRaw[] = [
} }
] ]
}, },
{
path: '/erp',
component: Layout,
name: 'ErpCenter',
meta: { hidden: true },
children: [
{
path: 'mold/detail/:id',
name: 'ErpMoldDetail',
meta: {
title: '模具详情',
noCache: true,
hidden: true,
activeMenu: '/erp/mold'
},
component: () => import('@/views/erp/mold/detail/index.vue')
}
]
},
{ {
path: '/:pathMatch(.*)*', path: '/:pathMatch(.*)*',

@ -790,13 +790,13 @@ getAllApi()
} }
.home-welcome { .home-welcome {
min-height: 240px;
display: flex; display: flex;
justify-content: space-between; min-height: 240px;
align-items: center;
background: linear-gradient(90deg, #3a6bc5 0%, #2a5298 100%);
padding: 0 24px; padding: 0 24px;
background: linear-gradient(90deg, #3a6bc5 0%, #2a5298 100%);
border-radius: 4px; border-radius: 4px;
justify-content: space-between;
align-items: center;
} }
.home-welcome-left { .home-welcome-left {
@ -804,9 +804,9 @@ getAllApi()
} }
.home-welcome-title { .home-welcome-title {
margin-bottom: 8px;
font-size: 32px; font-size: 32px;
font-weight: 500; font-weight: 500;
margin-bottom: 8px;
} }
.home-welcome-desc { .home-welcome-desc {
@ -859,13 +859,13 @@ getAllApi()
} }
.home-welcome-image { .home-welcome-image {
max-height: 180px;
width: auto; width: auto;
max-height: 180px;
} }
.production-overview-row { .production-overview-row {
margin-top: 16px;
display: flex; display: flex;
margin-top: 16px;
align-items: stretch; align-items: stretch;
gap: 48px; gap: 48px;
} }
@ -878,9 +878,9 @@ getAllApi()
} }
.production-overview-group-center { .production-overview-group-center {
border-left: 1px solid var(--el-border-color-lighter);
border-right: 1px solid var(--el-border-color-lighter);
padding: 0 48px; padding: 0 48px;
border-right: 1px solid var(--el-border-color-lighter);
border-left: 1px solid var(--el-border-color-lighter);
} }
.production-overview-item { .production-overview-item {
@ -926,8 +926,8 @@ getAllApi()
.stat-card { .stat-card {
padding: 12px 16px; padding: 12px 16px;
border-radius: 6px;
background-color: #f5f7fa; background-color: #f5f7fa;
border-radius: 6px;
} }
.stat-label { .stat-label {
@ -968,18 +968,18 @@ getAllApi()
} }
.progress-card { .progress-card {
display: flex;
height: 180px;
padding: 12px 16px; padding: 12px 16px;
border-radius: 6px;
background-color: #f5f7fa; background-color: #f5f7fa;
height: 180px; border-radius: 6px;
display: flex;
flex-direction: column; flex-direction: column;
} }
.progress-card-header { .progress-card-header {
margin-bottom: 8px;
font-size: 14px; font-size: 14px;
font-weight: 600; font-weight: 600;
margin-bottom: 8px;
} }
.progress-card-body { .progress-card-body {
@ -1013,8 +1013,8 @@ getAllApi()
.mini-card { .mini-card {
padding: 12px 16px; padding: 12px 16px;
border-radius: 6px;
background-color: #f5f7fa; background-color: #f5f7fa;
border-radius: 6px;
} }
.mini-label { .mini-label {
@ -1041,11 +1041,11 @@ getAllApi()
} }
.todo-card { .todo-card {
display: flex;
height: 150px;
padding: 12px 16px; padding: 12px 16px;
border-radius: 6px;
background-color: #f5f7fa; background-color: #f5f7fa;
height: 150px; border-radius: 6px;
display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
} }
@ -1061,7 +1061,7 @@ getAllApi()
color: #909399; color: #909399;
} }
@media (max-width: 768px) { @media (width <= 768px) {
.home-welcome { .home-welcome {
flex-direction: column; flex-direction: column;
align-items: flex-start; align-items: flex-start;

@ -58,218 +58,6 @@ link type="primary" @click="openForm('update', scope.row.id)"
<!-- 表单弹窗添加/修改 --> <!-- 表单弹窗添加/修改 -->
<MoldForm ref="formRef" @success="getList" /> <MoldForm ref="formRef" @success="getList" />
<el-dialog v-model="detailVisible" title="模具详情" width="80%" :destroy-on-close="true" draggable>
<div v-loading="detailLoading" class="mold-detail-body">
<el-descriptions :column="3" class="mold-detail-desc">
<el-descriptions-item label="模具编码">{{ detailData?.code ?? '' }}</el-descriptions-item>
<el-descriptions-item label="模具名称">{{ detailData?.name ?? '' }}</el-descriptions-item>
<el-descriptions-item label="模具状态">
<dict-tag :type="DICT_TYPE.ERP_MOLD_STATUS" :value="detailData?.status" />
</el-descriptions-item>
<el-descriptions-item label="模具型号">{{ detailData?.brandName ?? '' }}</el-descriptions-item>
<el-descriptions-item label="模具规格">{{ detailData?.moldType ?? '' }}</el-descriptions-item>
<el-descriptions-item label="工序">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="detailData?.orgType" />
</el-descriptions-item>
<el-descriptions-item label="模穴数">{{ detailData?.moldSize ?? '' }}</el-descriptions-item>
<el-descriptions-item label="使用次数/次">{{ detailData?.useTime ?? '' }}</el-descriptions-item>
<el-descriptions-item label="使用设备">{{ detailData?.machineName ?? detailData?.machineId ?? ''
}}</el-descriptions-item>
<el-descriptions-item label="入库日期">{{ formatDetailDate(detailData?.inTime) }}</el-descriptions-item>
<el-descriptions-item label="是否启用">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="detailData?.isEnable" />
</el-descriptions-item>
<el-descriptions-item label="备注">{{ detailData?.remark ?? '' }}</el-descriptions-item>
</el-descriptions>
<div class="mold-detail-tabs">
<el-tabs v-model="detailActiveTab" class="mt-12px">
<el-tab-pane label="点检履历" name="check">
<el-empty v-if="!inspectionStepGroups.length" />
<el-steps
v-else
direction="vertical"
:active="inspectionStepGroups.length"
class="device-ledger-history-steps"
>
<el-step v-for="group in inspectionStepGroups" :key="group.key">
<template #title>
<div class="device-ledger-history-title">
<span class="device-ledger-history-time">[{{ group.time }}]</span>
<span class="device-ledger-history-operator">操作人: {{ group.operator }}</span>
</div>
</template>
<template #description>
<div class="device-ledger-history-items">
<div
v-for="item in group.items"
:key="item.key"
class="device-ledger-history-item"
>
<div class="device-ledger-history-item-head">
<el-tag :type="getResultTagType(item.result)">{{ getResultLabel(item.result) }}</el-tag>
<span class="device-ledger-history-item-text">{{ item.name }}</span>
</div>
<div class="device-ledger-history-item-body">
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">点检方式</span>
<span class="device-ledger-history-item-value">
<dict-tag type="Inspection_method" :value="item.method" />
</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">判定标准</span>
<span class="device-ledger-history-item-value">{{ item.criteria ?? '-' }}</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">点检时间</span>
<span class="device-ledger-history-item-value">
{{ formatHistoryTime(item.inspectionTime) }}
</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">创建时间</span>
<span class="device-ledger-history-item-value">
{{ formatHistoryTime(item.createTime) }}
</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">备注</span>
<span class="device-ledger-history-item-value">{{ item.remark ?? '-' }}</span>
</div>
<div
v-if="item.images?.length"
class="device-ledger-history-item-images"
>
<el-image
v-for="img in item.images"
:key="img"
:src="img"
:preview-src-list="item.images"
preview-teleported
fit="cover"
class="device-ledger-history-item-image"
>
<template #error>
<div class="device-ledger-history-image-error">图片加载失败</div>
</template>
</el-image>
</div>
</div>
</div>
</div>
</template>
</el-step>
</el-steps>
</el-tab-pane>
<el-tab-pane label="保养履历" name="maintain">
<el-empty v-if="!maintainStepGroups.length" />
<el-steps
v-else
direction="vertical"
class="device-ledger-history-steps"
:active="maintainStepGroups.length"
>
<el-step v-for="group in maintainStepGroups" :key="group.key">
<template #title>
<div class="device-ledger-history-title">
<span class="device-ledger-history-time">[{{ group.time }}]</span>
<span class="device-ledger-history-operator">操作人: {{ group.operator }}</span>
</div>
</template>
<template #description>
<div class="device-ledger-history-items">
<div
v-for="item in group.items"
:key="item.key"
class="device-ledger-history-item"
>
<div class="device-ledger-history-item-head">
<el-tag :type="getResultTagType(item.result)">{{ getResultLabel(item.result) }}</el-tag>
<span class="device-ledger-history-item-text">{{ item.name }}</span>
</div>
<div class="device-ledger-history-item-body">
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">保养方式</span>
<span class="device-ledger-history-item-value">
<dict-tag type="Inspection_method" :value="item.method" />
</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">判定标准</span>
<span class="device-ledger-history-item-value">{{ item.criteria ?? '-' }}</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">保养时间</span>
<span class="device-ledger-history-item-value">
{{ formatHistoryTime(item.inspectionTime) }}
</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">创建时间</span>
<span class="device-ledger-history-item-value">
{{ formatHistoryTime(item.createTime) }}
</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">备注</span>
<span class="device-ledger-history-item-value">{{ item.remark ?? '-' }}</span>
</div>
<div
v-if="item.images?.length"
class="device-ledger-history-item-images"
>
<el-image
v-for="img in item.images"
:key="img"
:src="img"
:preview-src-list="item.images"
preview-teleported
fit="cover"
class="device-ledger-history-item-image"
>
<template #error>
<div class="device-ledger-history-image-error">图片加载失败</div>
</template>
</el-image>
</div>
</div>
</div>
</div>
</template>
</el-step>
</el-steps>
</el-tab-pane>
<el-tab-pane label="维修履历" name="repair">
<el-empty v-if="!repairHistoryView.length" />
<el-table
v-else :data="repairHistoryView" :stripe="true" :show-overflow-tooltip="true"
class="mold-history-table">
<el-table-column label="维修单ID" prop="repairId" width="120" />
<el-table-column label="项目编码" prop="subjectCode" width="120" />
<el-table-column label="项目名称" prop="subjectName" min-width="160" />
<el-table-column label="项目内容" prop="subjectContent" min-width="200" />
<el-table-column label="判定标准" prop="subjectStandard" min-width="200" />
<el-table-column label="故障描述" prop="malfunction" min-width="200" />
<el-table-column label="维修描述" prop="repairDes" min-width="200" />
<el-table-column label="备注" prop="remark" min-width="200" />
<el-table-column label="创建时间" prop="createTime" width="180">
<template #default="scope">
{{ formatHistoryTime(scope.row.createTime) }}
</template>
</el-table-column>
</el-table>
</el-tab-pane>
</el-tabs>
</div>
</div>
<template #footer>
<div class="dialog-footer">
<el-button @click="detailVisible = false"> </el-button>
</div>
</template>
</el-dialog>
<!-- 表单弹窗添加/修改 --> <!-- 表单弹窗添加/修改 -->
<MoldRecordForm ref="recordFormRef" @success="getList" /> <MoldRecordForm ref="recordFormRef" @success="getList" />
</template> </template>
@ -354,291 +142,10 @@ const recordFormRef = ref()
const openRecordForm = (type: string, id?: number, brandId?: number) => { const openRecordForm = (type: string, id?: number, brandId?: number) => {
recordFormRef.value.open(type, id, brandId) recordFormRef.value.open(type, id, brandId)
} }
const { push } = useRouter()
const detailVisible = ref(false) const openDetail = (id: number) => {
const detailLoading = ref(false) push({ name: 'ErpMoldDetail', params: { id } })
const detailData = ref<(MoldVO & Record<string, any>) | null>(null)
const detailActiveTab = ref('check')
const formatDetailDate = (value: any) => {
if (!value) return ''
return formatDate(new Date(value), 'YYYY-MM-DD')
}
const formatHistoryTime = (value: any) => {
const raw = value ?? '-'
if (Array.isArray(raw) && raw.length >= 3) {
const [y, m, d, hh, mm, ss] = raw
const pad = (n: any) => String(n).padStart(2, '0')
if (hh !== undefined) return `${y}-${pad(m)}-${pad(d)} ${pad(hh)}:${pad(mm)}:${pad(ss)}`
return `${y}-${pad(m)}-${pad(d)}`
}
return String(raw)
}
const getResultLabel = (value: any) => {
const v = value === '' || value === null || value === undefined ? undefined : String(value)
if (v === '0') return '待检测'
if (v === '1') return 'OK'
if (v === '2') return 'NG'
return '-'
}
const getResultTagType = (value: any) => {
const v = value === '' || value === null || value === undefined ? undefined : String(value)
if (v === '1') return 'success'
if (v === '2') return 'danger'
if (v === '0') return 'info'
return 'info'
}
const inspectionHistory = computed(() => {
const data: any = detailData.value
return data?.inspectionList ?? []
})
const maintainHistory = computed(() => {
const data: any = detailData.value
const list = data?.maintainList ?? []
return Array.isArray(list) ? list : []
})
type HistoryStepItem = {
key: string
name: string
result: any
method?: any
criteria?: any
images?: string[]
remark?: any
inspectionTime?: any
createTime?: any
}
type HistoryStepGroup = { key: string; time: string; operator: string; items: HistoryStepItem[] }
const parseImages = (value: any): string[] => {
if (!value) return []
if (Array.isArray(value)) return value.map(String).filter(Boolean)
const cleaned = String(value).replace(/[`'\"]/g, '').trim()
return cleaned
.split(',')
.map((v) => v.trim())
.filter(Boolean)
}
const buildStepGroups = (
rows: any[],
options: { timeField: string; nameFieldCandidates: string[]; resultFieldCandidates: string[] }
) => {
const groups = new Map<string, HistoryStepGroup>()
for (const row of rows ?? []) {
const time = formatHistoryTime(row?.[options.timeField] ?? row?.createTime)
const operator = String(row?.creatorName ?? row?.creator ?? '-')
const groupKey = `${row?.managementId ?? ''}__${time}__${operator}`
const name =
options.nameFieldCandidates
.map((k) => row?.[k])
.find((v) => v !== undefined && v !== null && String(v).trim() !== '') ?? '-'
const result =
options.resultFieldCandidates.map((k) => row?.[k]).find((v) => v !== undefined && v !== null) ?? undefined
const item: HistoryStepItem = {
key: String(row?.id ?? `${groupKey}__${String(name)}`),
name: String(name),
result,
method: row?.inspectionMethod,
criteria: row?.judgmentCriteria,
images: parseImages(row?.images),
remark: row?.remark,
inspectionTime: row?.inspectionTime,
createTime: row?.createTime
}
if (!groups.has(groupKey)) {
groups.set(groupKey, { key: groupKey, time, operator, items: [item] })
} else {
groups.get(groupKey)!.items.push(item)
}
}
return Array.from(groups.values()).sort((a, b) => String(b.time).localeCompare(String(a.time)))
}
const inspectionStepGroups = computed<HistoryStepGroup[]>(() => {
return buildStepGroups(inspectionHistory.value, {
timeField: 'inspectionTime',
nameFieldCandidates: ['inspectionItemName', 'name'],
resultFieldCandidates: ['inspectionResult']
})
})
const maintainStepGroups = computed<HistoryStepGroup[]>(() => {
return buildStepGroups(maintainHistory.value, {
timeField: 'inspectionTime',
nameFieldCandidates: ['maintainItemName', 'inspectionItemName', 'name'],
resultFieldCandidates: ['maintainResult', 'inspectionResult']
})
})
type RepairHistoryRow = {
repairId?: any
subjectCode?: any
subjectName?: any
subjectContent?: any
subjectStandard?: any
malfunction?: any
repairDes?: any
remark?: any
createTime?: any
}
const repairHistoryView = computed<RepairHistoryRow[]>(() => {
const data: any = detailData.value
const raw = data?.repairList
if (!raw) return []
if (Array.isArray(raw)) {
return raw as RepairHistoryRow[]
}
if (typeof raw === 'object') {
const result: RepairHistoryRow[] = []
Object.values(raw as Record<string, any>).forEach((rows: any) => {
if (Array.isArray(rows)) {
result.push(...(rows as RepairHistoryRow[]))
}
})
return result
}
return []
})
const openDetail = async (id: number) => {
detailVisible.value = true
detailActiveTab.value = 'check'
detailLoading.value = true
try {
detailData.value = await MoldBrandApi.getMold(id)
} finally {
detailLoading.value = false
}
} }
</script> </script>
<style scoped>
.mold-detail-desc {
margin-bottom: 16px;
}
.mold-history-table {
margin-top: 8px;
}
.mold-detail-body {
max-height: 70vh;
}
.mold-detail-tabs {
max-height: 50vh;
overflow-y: auto;
padding-right: 4px;
}
.device-ledger-history-steps {
padding: 8px 8px 0;
}
.device-ledger-history-title {
display: flex;
align-items: center;
gap: 10px;
font-size: 13px;
}
.device-ledger-history-time {
font-weight: 600;
}
.device-ledger-history-operator {
color: var(--el-text-color-secondary);
}
.device-ledger-history-items {
display: flex;
flex-direction: column;
gap: 6px;
margin-top: 8px;
}
.device-ledger-history-item {
display: flex;
flex-direction: column;
gap: 8px;
padding: 10px;
border: 1px solid var(--el-border-color-lighter);
border-radius: 8px;
background: var(--el-fill-color-blank);
}
.device-ledger-history-item-head {
display: flex;
align-items: center;
gap: 10px;
}
.device-ledger-history-item-body {
display: flex;
flex-direction: column;
gap: 6px;
width: 100%;
}
.device-ledger-history-item-row {
display: flex;
gap: 10px;
}
.device-ledger-history-item-label {
width: 70px;
flex: 0 0 70px;
color: var(--el-text-color-secondary);
}
.device-ledger-history-item-value {
flex: 1;
color: var(--el-text-color-regular);
word-break: break-word;
}
.device-ledger-history-item-images {
display: flex;
flex-wrap: wrap;
gap: 8px;
margin-top: 4px;
}
.device-ledger-history-item-image {
width: 76px;
height: 76px;
border-radius: 6px;
overflow: hidden;
}
.device-ledger-history-image-error {
width: 100%;
height: 100%;
display: flex;
align-items: center;
justify-content: center;
font-size: 12px;
color: var(--el-text-color-secondary);
background: var(--el-fill-color);
}
.device-ledger-history-item-text {
color: var(--el-text-color-regular);
}
</style>

@ -0,0 +1,830 @@
<template>
<ContentWrap>
<div v-loading="detailLoading" class="mold-detail-body">
<el-descriptions :column="3" class="mold-detail-desc">
<el-descriptions-item label="模具编码">{{ detailData?.code ?? '' }}</el-descriptions-item>
<el-descriptions-item label="模具名称">{{ detailData?.name ?? '' }}</el-descriptions-item>
<el-descriptions-item label="模具状态">
<dict-tag :type="DICT_TYPE.ERP_MOLD_STATUS" :value="detailData?.status" />
</el-descriptions-item>
<el-descriptions-item label="模具型号">{{ detailData?.brandName ?? '' }}</el-descriptions-item>
<el-descriptions-item label="模具规格">{{ detailData?.moldType ?? '' }}</el-descriptions-item>
<el-descriptions-item label="工序">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="detailData?.orgType" />
</el-descriptions-item>
<el-descriptions-item label="模穴数">{{ detailData?.moldSize ?? '' }}</el-descriptions-item>
<el-descriptions-item label="使用次数/次">{{ detailData?.useTime ?? '' }}</el-descriptions-item>
<el-descriptions-item label="使用设备">{{ detailData?.machineName ?? detailData?.machineId ?? ''
}}</el-descriptions-item>
<el-descriptions-item label="入库日期">{{ formatDetailDate(detailData?.inTime) }}</el-descriptions-item>
<el-descriptions-item label="是否启用">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="detailData?.isEnable" />
</el-descriptions-item>
<el-descriptions-item label="备注">{{ detailData?.remark ?? '' }}</el-descriptions-item>
</el-descriptions>
<div class="mold-detail-tabs">
<el-tabs v-model="detailActiveTab" class="mt-12px">
<el-tab-pane label="点检履历" name="check">
<div class="device-ledger-tab-toolbar">
<el-date-picker
v-model="inspectionDateRange"
type="daterange"
value-format="YYYY-MM-DD HH:mm:ss"
start-placeholder="开始时间"
end-placeholder="结束时间"
range-separator="至"
:unlink-panels="true"
class="mr-10px"
/>
<el-button type="primary" plain @click="handleQueryInspection"></el-button>
<el-button @click="handleResetInspection"></el-button>
<el-button
type="success"
plain
:loading="inspectionExportLoading"
@click="handleExportInspection"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</div>
<el-empty v-if="!inspectionStepGroups.length" />
<el-steps
v-else direction="vertical" :active="inspectionStepGroups.length"
class="device-ledger-history-steps">
<el-step v-for="group in inspectionStepGroups" :key="group.key">
<template #title>
<div class="device-ledger-history-title">
<span class="device-ledger-history-time">[{{ group.time }}]</span>
<span class="device-ledger-history-operator">操作人: {{ group.operator }}</span>
</div>
</template>
<template #description>
<div class="device-ledger-history-items">
<div v-for="item in group.items" :key="item.key" class="device-ledger-history-item">
<div class="device-ledger-history-item-head">
<el-tag :type="getResultTagType(item.result)">{{ getResultLabel(item.result) }}</el-tag>
<span class="device-ledger-history-item-text">{{ item.name }}</span>
</div>
<div class="device-ledger-history-item-body">
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">点检方式</span>
<span class="device-ledger-history-item-value">
<dict-tag type="Inspection_method" :value="item.method" />
</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">判定标准</span>
<span class="device-ledger-history-item-value">{{ item.criteria ?? '-' }}</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">点检时间</span>
<span class="device-ledger-history-item-value">
{{ formatHistoryTime(item.taskTime) }}
</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">创建时间</span>
<span class="device-ledger-history-item-value">
{{ formatHistoryTime(item.createTime) }}
</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">备注</span>
<span class="device-ledger-history-item-value">{{ item.remark ?? '-' }}</span>
</div>
<div v-if="item.images?.length" class="device-ledger-history-item-images">
<el-image
v-for="img in item.images" :key="img" :src="img" :preview-src-list="item.images"
preview-teleported fit="cover" class="device-ledger-history-item-image">
<template #error>
<div class="device-ledger-history-image-error">图片加载失败</div>
</template>
</el-image>
</div>
</div>
</div>
</div>
</template>
</el-step>
</el-steps>
</el-tab-pane>
<el-tab-pane label="保养履历" name="maintain">
<div class="device-ledger-tab-toolbar">
<el-date-picker
v-model="maintainDateRange"
type="daterange"
value-format="YYYY-MM-DD HH:mm:ss"
start-placeholder="开始时间"
end-placeholder="结束时间"
range-separator="至"
:unlink-panels="true"
class="mr-10px"
/>
<el-button type="primary" plain @click="handleQueryMaintain"></el-button>
<el-button @click="handleResetMaintain"></el-button>
<el-button
type="success"
plain
:loading="maintainExportLoading"
@click="handleExportMaintain"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</div>
<el-empty v-if="!maintainStepGroups.length" />
<el-steps
v-else direction="vertical" class="device-ledger-history-steps"
:active="maintainStepGroups.length">
<el-step v-for="group in maintainStepGroups" :key="group.key">
<template #title>
<div class="device-ledger-history-title">
<span class="device-ledger-history-time">[{{ group.time }}]</span>
<span class="device-ledger-history-operator">操作人: {{ group.operator }}</span>
</div>
</template>
<template #description>
<div class="device-ledger-history-items">
<div v-for="item in group.items" :key="item.key" class="device-ledger-history-item">
<div class="device-ledger-history-item-head">
<el-tag :type="getResultTagType(item.result)">{{ getResultLabel(item.result) }}</el-tag>
<span class="device-ledger-history-item-text">{{ item.name }}</span>
</div>
<div class="device-ledger-history-item-body">
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">保养方式</span>
<span class="device-ledger-history-item-value">
<dict-tag type="Inspection_method" :value="item.method" />
</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">判定标准</span>
<span class="device-ledger-history-item-value">{{ item.criteria ?? '-' }}</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">保养时间</span>
<span class="device-ledger-history-item-value">
{{ String(formatHistoryTime(item.taskTime)).split(' ')[0] }}
</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">创建时间</span>
<span class="device-ledger-history-item-value">
{{ formatHistoryTime(item.createTime) }}
</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">备注</span>
<span class="device-ledger-history-item-value">{{ item.remark ?? '-' }}</span>
</div>
<div v-if="item.images?.length" class="device-ledger-history-item-images">
<el-image
v-for="img in item.images" :key="img" :src="img" :preview-src-list="item.images"
preview-teleported fit="cover" class="device-ledger-history-item-image">
<template #error>
<div class="device-ledger-history-image-error">图片加载失败</div>
</template>
</el-image>
</div>
</div>
</div>
</div>
</template>
</el-step>
</el-steps>
</el-tab-pane>
<el-tab-pane label="维修履历" name="repair">
<div class="device-ledger-tab-toolbar">
<el-date-picker
v-model="repairDateRange"
type="daterange"
value-format="YYYY-MM-DD HH:mm:ss"
start-placeholder="开始时间"
end-placeholder="结束时间"
range-separator="至"
:unlink-panels="true"
class="mr-10px"
/>
<el-button type="primary" plain @click="handleQueryRepair"></el-button>
<el-button @click="handleResetRepair"></el-button>
<el-button
type="success"
plain
:loading="repairExportLoading"
@click="handleExportRepair"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</div>
<el-empty v-if="!repairGroups.length" />
<el-collapse v-else v-model="repairActiveNames" class="device-ledger-repair-collapse">
<el-collapse-item v-for="group in repairGroups" :key="group.key" :name="group.key">
<template #title>
<div class="device-ledger-repair-title">
<span class="device-ledger-repair-name">{{ group.name }}</span>
<span class="device-ledger-repair-meta">{{ group.items.length }}</span>
</div>
</template>
<div class="device-ledger-history-items">
<div
v-for="row in group.items"
:key="String(row.id ?? row.subjectId ?? row.subjectCode)"
class="device-ledger-history-item"
>
<div class="device-ledger-history-item-head">
<el-tag type="info" effect="light">{{ row.subjectCode ?? '-' }}</el-tag>
<span class="device-ledger-history-item-text">{{ row.subjectName ?? '-' }}</span>
</div>
<div class="device-ledger-history-item-body">
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">项目内容</span>
<span class="device-ledger-history-item-value">{{ row.subjectContent ?? '-' }}</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">维修结果</span>
<span class="device-ledger-history-item-value">
<el-tag :type="getResultTagType(row.result ?? row.repairResult)">
{{ getResultLabel(row.repairResult ?? row.result) }}
</el-tag>
</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">备注</span>
<span class="device-ledger-history-item-value">{{ row.remark ?? '-' }}</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">完成日期</span>
<span class="device-ledger-history-item-value">
{{ String(formatHistoryTime(row.finishDate)).split(' ')[0] }}
</span>
</div>
<div v-if="row.malfunctionImages?.length" class="device-ledger-history-item-images">
<el-image
v-for="img in row.malfunctionImages"
:key="img"
:src="img"
:preview-src-list="row.malfunctionImages"
preview-teleported
fit="cover"
class="device-ledger-history-item-image"
>
<template #error>
<div class="device-ledger-history-image-error">图片加载失败</div>
</template>
</el-image>
</div>
</div>
</div>
</div>
</el-collapse-item>
</el-collapse>
</el-tab-pane>
</el-tabs>
</div>
</div>
</ContentWrap>
</template>
<script setup lang="ts">
import { DICT_TYPE } from '@/utils/dict'
import { formatDate } from '@/utils/formatTime'
import { MoldBrandApi, type MoldVO } from '@/api/erp/mold'
import { TicketManagementApi } from '@/api/mold/ticketManagement'
import { MoldRepairApi } from '@/api/mold/moldrepair'
import download from '@/utils/download'
import { useTagsViewStore } from '@/store/modules/tagsView'
defineOptions({ name: 'ErpMoldDetail' })
const message = useMessage()
const route = useRoute()
const { delView } = useTagsViewStore()
const { currentRoute } = useRouter()
const detailLoading = ref(false)
const detailData = ref<(MoldVO & Record<string, any>) | null>(null)
const detailActiveTab = ref('check')
const inspectionExportLoading = ref(false)
const inspectionDateRange = ref<string[] | undefined>(undefined)
const maintainExportLoading = ref(false)
const maintainDateRange = ref<string[] | undefined>(undefined)
const repairExportLoading = ref(false)
const repairDateRange = ref<string[] | undefined>(undefined)
const formatDetailDate = (value: any) => {
if (!value) return ''
return formatDate(new Date(value), 'YYYY-MM-DD')
}
const formatHistoryTime = (value: any) => {
const raw = value ?? '-'
if (Array.isArray(raw) && raw.length >= 3) {
const [y, m, d, hh, mm, ss] = raw
const pad = (n: any) => String(n).padStart(2, '0')
if (hh !== undefined) return `${y}-${pad(m)}-${pad(d)} ${pad(hh)}:${pad(mm)}:${pad(ss)}`
return `${y}-${pad(m)}-${pad(d)}`
}
const tryDateFromNumber = (v: any) => {
const num = Number(v)
if (!Number.isFinite(num)) return undefined
const s = String(v).trim()
const ms = s.length === 10 ? num * 1000 : num
const d = new Date(ms)
if (Number.isNaN(d.getTime())) return undefined
return d
}
const tryDateFromString = (v: any) => {
const s = String(v).trim()
if (!s) return undefined
const d = new Date(s)
if (Number.isNaN(d.getTime())) return undefined
return d
}
const d = typeof raw === 'number' ? tryDateFromNumber(raw) : tryDateFromNumber(raw) ?? tryDateFromString(raw)
if (d) return formatDate(d, 'YYYY-MM-DD HH:mm:ss')
return String(raw)
}
const getResultLabel = (value: any) => {
const v = value === '' || value === null || value === undefined ? undefined : String(value)
if (!v) return '-'
const upper = v.toUpperCase()
if (v === '0') return '待检测'
if (v === '1' || upper === 'OK') return '通过'
if (v === '2' || upper === 'NG') return '不通过'
return v
}
const getResultTagType = (value: any) => {
const v = value === '' || value === null || value === undefined ? undefined : String(value)
if (!v) return 'info'
const upper = v.toUpperCase()
if (v === '1' || upper === 'OK') return 'success'
if (v === '2' || upper === 'NG') return 'danger'
if (v === '0') return 'info'
return 'info'
}
const inspectionHistory = ref<any[]>([])
const maintainHistory = ref<any[]>([])
type HistoryStepItem = {
key: string
name: string
result: any
method?: any
criteria?: any
images?: string[]
remark?: any
taskTime?: any
inspectionTime?: any
createTime?: any
}
type HistoryStepGroup = { key: string; time: string; operator: string; items: HistoryStepItem[] }
const parseImages = (value: any): string[] => {
if (!value) return []
if (Array.isArray(value)) return value.map(String).filter(Boolean)
const cleaned = String(value).replace(/[`'\"]/g, '').trim()
return cleaned
.split(',')
.map((v) => v.trim())
.filter(Boolean)
}
const buildStepGroups = (
rows: any[],
options: { timeField: string; nameFieldCandidates: string[]; resultFieldCandidates: string[] }
) => {
const groups = new Map<string, HistoryStepGroup>()
for (const row of rows ?? []) {
const time = formatHistoryTime(row?.taskTime ?? row?.[options.timeField] ?? row?.createTime)
const operator = String(row?.operator ?? row?.creatorName ?? row?.creator ?? '-')
const groupKey = `${row?.managementId ?? ''}__${time}__${operator}`
const name =
options.nameFieldCandidates
.map((k) => row?.[k])
.find((v) => v !== undefined && v !== null && String(v).trim() !== '') ?? '-'
const result =
options.resultFieldCandidates.map((k) => row?.[k]).find((v) => v !== undefined && v !== null) ?? undefined
const item: HistoryStepItem = {
key: String(row?.id ?? `${groupKey}__${String(name)}`),
name: String(name),
result,
method: row?.inspectionMethod,
criteria: row?.judgmentCriteria,
images: parseImages(row?.images),
remark: row?.remark,
taskTime: row?.taskTime,
inspectionTime: row?.inspectionTime,
createTime: row?.createTime
}
if (!groups.has(groupKey)) {
groups.set(groupKey, { key: groupKey, time, operator, items: [item] })
} else {
groups.get(groupKey)!.items.push(item)
}
}
return Array.from(groups.values()).sort((a, b) => String(b.time).localeCompare(String(a.time)))
}
const inspectionStepGroups = computed<HistoryStepGroup[]>(() => {
return buildStepGroups(inspectionHistory.value, {
timeField: 'inspectionTime',
nameFieldCandidates: ['inspectionItemName', 'name'],
resultFieldCandidates: ['inspectionResult']
})
})
const maintainStepGroups = computed<HistoryStepGroup[]>(() => {
return buildStepGroups(maintainHistory.value, {
timeField: 'inspectionTime',
nameFieldCandidates: ['maintainItemName', 'inspectionItemName', 'name'],
resultFieldCandidates: ['maintainResult', 'inspectionResult']
})
})
type RepairHistoryRow = {
id?: any
repairId?: any
repairCode?: any
repairName?: any
subjectId?: any
subjectCode?: any
subjectName?: any
subjectContent?: any
subjectStandard?: any
malfunction?: any
malfunctionUrl?: any
repairDes?: any
remark?: any
createTime?: any
finishDate?: any
result?: any
repairResult?: any
malfunctionImages?: string[]
}
type RepairHistoryGroup = { key: string; name: string; items: RepairHistoryRow[] }
const repairActiveNames = ref<string[]>([])
const repairList = ref<RepairHistoryRow[]>([])
const repairGroups = computed<RepairHistoryGroup[]>(() => {
const groupsMap = new Map<string, RepairHistoryGroup>()
for (const row of repairList.value ?? []) {
const key = String(row.repairCode ?? row.repairId ?? row.subjectName ?? '-')
if (!groupsMap.has(key)) {
groupsMap.set(key, {
key,
name: String(row.repairName ?? row.repairCode ?? key),
items: []
})
}
const group = groupsMap.get(key)!
group.items.push({
...row,
malfunctionImages: parseImages(row?.malfunctionUrl)
})
}
const groups = Array.from(groupsMap.values()).filter((g) => g.items.length)
return groups.sort((a, b) => {
const at = formatHistoryTime(a.items?.[0]?.finishDate ?? a.items?.[0]?.createTime)
const bt = formatHistoryTime(b.items?.[0]?.finishDate ?? b.items?.[0]?.createTime)
return String(bt).localeCompare(String(at))
})
})
const fetchRepairHistory = async () => {
const id = Number(route.params.id)
if (!id) return
const params: any = { moldId: id }
if (repairDateRange.value && repairDateRange.value.length === 2) {
params.startTime = repairDateRange.value[0]
params.endTime = repairDateRange.value[1]
}
const data = await MoldRepairApi.getRepairListByMoldId(params)
repairList.value = Array.isArray(data) ? data : []
}
const handleQueryRepair = async () => {
const id = Number(route.params.id)
if (!id) {
message.error('参数错误,模具不能为空')
return
}
await fetchRepairHistory()
}
const handleResetRepair = async () => {
const id = Number(route.params.id)
if (!id) {
message.error('参数错误,模具不能为空')
return
}
repairDateRange.value = undefined
await fetchRepairHistory()
}
const handleExportRepair = async () => {
const id = Number(route.params.id)
if (!id) {
message.error('参数错误,模具不能为空')
return
}
try {
repairExportLoading.value = true
const params: any = { moldId: id }
if (repairDateRange.value && repairDateRange.value.length === 2) {
params.startTime = repairDateRange.value[0]
params.endTime = repairDateRange.value[1]
}
const data = await MoldRepairApi.exportRepairExcel(params)
download.excel(data, '模具维修履历.xls')
} finally {
repairExportLoading.value = false
}
}
const fetchMaintainHistory = async () => {
const id = Number(route.params.id)
if (!id) return
const params: any = { moldId: id }
if (maintainDateRange.value && maintainDateRange.value.length === 2) {
params.startTime = maintainDateRange.value[0]
params.endTime = maintainDateRange.value[1]
}
const data = await TicketManagementApi.getMaintenanceByMoldId(params)
maintainHistory.value = Array.isArray(data) ? data : []
}
const handleQueryMaintain = async () => {
const id = Number(route.params.id)
if (!id) {
message.error('参数错误,模具不能为空')
return
}
await fetchMaintainHistory()
}
const handleResetMaintain = async () => {
const id = Number(route.params.id)
if (!id) {
message.error('参数错误,模具不能为空')
return
}
maintainDateRange.value = undefined
await fetchMaintainHistory()
}
const handleExportMaintain = async () => {
const id = Number(route.params.id)
if (!id) {
message.error('参数错误,模具不能为空')
return
}
try {
maintainExportLoading.value = true
const params: any = { moldId: id }
if (maintainDateRange.value && maintainDateRange.value.length === 2) {
params.startTime = maintainDateRange.value[0]
params.endTime = maintainDateRange.value[1]
}
const data = await TicketManagementApi.exportMaintenance(params)
download.excel(data, '模具保养履历.xls')
} finally {
maintainExportLoading.value = false
}
}
const fetchInspectionHistory = async () => {
const id = Number(route.params.id)
if (!id) return
const params: any = { moldId: id }
if (inspectionDateRange.value && inspectionDateRange.value.length === 2) {
params.startTime = inspectionDateRange.value[0]
params.endTime = inspectionDateRange.value[1]
}
const data = await TicketManagementApi.getInspectionByMoldId(params)
inspectionHistory.value = Array.isArray(data) ? data : []
}
const handleQueryInspection = async () => {
const id = Number(route.params.id)
if (!id) {
message.error('参数错误,模具不能为空')
return
}
await fetchInspectionHistory()
}
const handleResetInspection = async () => {
const id = Number(route.params.id)
if (!id) {
message.error('参数错误,模具不能为空')
return
}
inspectionDateRange.value = undefined
await fetchInspectionHistory()
}
const handleExportInspection = async () => {
const id = Number(route.params.id)
if (!id) {
message.error('参数错误,模具不能为空')
return
}
try {
inspectionExportLoading.value = true
const params: any = { moldId: id }
if (inspectionDateRange.value && inspectionDateRange.value.length === 2) {
params.startTime = inspectionDateRange.value[0]
params.endTime = inspectionDateRange.value[1]
}
const data = await TicketManagementApi.exportInspection(params)
download.excel(data, '模具点检履历.xls')
} finally {
inspectionExportLoading.value = false
}
}
const close = () => {
delView(unref(currentRoute))
}
const getDetail = async () => {
const id = Number(route.params.id)
if (!id) {
message.error('参数错误,模具不能为空')
close()
return
}
detailActiveTab.value = 'check'
detailLoading.value = true
try {
detailData.value = await MoldBrandApi.getMold(id)
await fetchInspectionHistory()
await fetchMaintainHistory()
await fetchRepairHistory()
} finally {
detailLoading.value = false
}
}
onMounted(async () => {
await getDetail()
})
</script>
<style scoped>
.mold-detail-desc {
margin-bottom: 16px;
}
.mold-history-table {
margin-top: 8px;
}
.mold-detail-body {
max-height: 85vh;
}
.mold-detail-tabs {
padding-right: 4px;
}
:deep(.el-tabs__content) {
max-height: 65vh;
overflow-y: auto;
}
.device-ledger-history-steps {
padding: 8px 8px 0;
}
.device-ledger-tab-toolbar {
margin-bottom: 16px;
}
.device-ledger-history-title {
display: flex;
align-items: center;
gap: 10px;
font-size: 13px;
}
.device-ledger-history-time {
font-weight: 600;
}
.device-ledger-history-operator {
color: var(--el-text-color-secondary);
}
.device-ledger-history-items {
display: flex;
flex-direction: column;
gap: 6px;
margin-top: 8px;
}
.device-ledger-history-item {
display: flex;
padding: 10px;
background: var(--el-fill-color-blank);
border: 1px solid var(--el-border-color-lighter);
border-radius: 8px;
flex-direction: column;
gap: 8px;
}
.device-ledger-history-item-head {
display: flex;
align-items: center;
gap: 10px;
}
.device-ledger-history-item-body {
display: flex;
flex-direction: column;
gap: 6px;
width: 100%;
}
.device-ledger-history-item-row {
display: flex;
gap: 10px;
}
.device-ledger-history-item-label {
width: 70px;
flex: 0 0 70px;
color: var(--el-text-color-secondary);
}
.device-ledger-history-item-value {
flex: 1;
color: var(--el-text-color-regular);
word-break: break-word;
}
.device-ledger-history-item-images {
display: flex;
flex-wrap: wrap;
gap: 8px;
margin-top: 4px;
}
.device-ledger-history-item-image {
width: 76px;
height: 76px;
overflow: hidden;
border-radius: 6px;
}
.device-ledger-history-image-error {
display: flex;
width: 100%;
height: 100%;
font-size: 12px;
color: var(--el-text-color-secondary);
background: var(--el-fill-color);
align-items: center;
justify-content: center;
}
.device-ledger-repair-collapse {
padding: 8px 8px 0;
}
.device-ledger-repair-title {
display: flex;
align-items: center;
justify-content: space-between;
width: 100%;
}
.device-ledger-repair-name {
font-weight: 600;
color: var(--el-text-color-primary);
}
.device-ledger-repair-meta {
font-size: 12px;
color: var(--el-text-color-secondary);
}
.device-ledger-history-item-text {
color: var(--el-text-color-regular);
}
</style>

@ -595,23 +595,23 @@ onMounted(() => {
.formula-config-panel { .formula-config-panel {
width: calc((100% - 96px) / 2); width: calc((100% - 96px) / 2);
border: 1px solid var(--el-border-color);
border-radius: 4px;
overflow: hidden; overflow: hidden;
background: var(--el-bg-color); background: var(--el-bg-color);
border: 1px solid var(--el-border-color);
border-radius: 4px;
} }
.formula-config-panel__header { .formula-config-panel__header {
display: flex; display: flex;
justify-content: space-between;
padding: 10px 12px; padding: 10px 12px;
border-bottom: 1px solid var(--el-border-color);
font-weight: 600; font-weight: 600;
border-bottom: 1px solid var(--el-border-color);
justify-content: space-between;
} }
.formula-config-panel__meta { .formula-config-panel__meta {
color: var(--el-text-color-secondary);
font-weight: 400; font-weight: 400;
color: var(--el-text-color-secondary);
} }
.formula-config-panel__filter { .formula-config-panel__filter {
@ -624,8 +624,8 @@ onMounted(() => {
} }
.formula-config-actions { .formula-config-actions {
width: 96px;
display: flex; display: flex;
width: 96px;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
align-items: center; align-items: center;

@ -168,9 +168,11 @@ const formRules = reactive({
create: { create: {
deviceCode: [{ required: true, message: '设备编码不能为空', trigger: 'blur' }], deviceCode: [{ required: true, message: '设备编码不能为空', trigger: 'blur' }],
deviceName: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }], deviceName: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
sampleCycle: [{ required: true, message: '采集周期不能为空', trigger: 'blur' }],
isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'blur' }] isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'blur' }]
}, },
update: { update: {
sampleCycle: [{ required: true, message: '采集周期不能为空', trigger: 'blur' }],
isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'blur' }] isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'blur' }]
}, },
setting: { setting: {

@ -145,12 +145,271 @@ link :type="isRowConnected(scope.row) ? 'warning' : 'success'"
<DeviceForm ref="formRef" @success="getList" /> <DeviceForm ref="formRef" @success="getList" />
<!-- 子表的列表 --> <!-- 子表的列表 -->
<ContentWrap> <ContentWrap>
<el-tabs model-value="deviceAttribute"> <template v-if="attributeDeviceId">
<div class="mb-10px text-sm text-gray-500">
当前设备<span class="font-medium text-gray-700">{{ attributeDeviceName || '-' }}</span>
</div>
<el-tabs v-model="deviceTabActive">
<el-tab-pane :label="deviceAttributeTabLabel" name="deviceAttribute"> <el-tab-pane :label="deviceAttributeTabLabel" name="deviceAttribute">
<DeviceAttributeList v-if="attributeDeviceId" :device-id="attributeDeviceId" /> <DeviceAttributeList :device-id="attributeDeviceId" />
<el-empty v-else description="请点击设备列表的“点位”查看设备属性" /> </el-tab-pane>
<el-tab-pane :label="deviceRuleTabLabel" name="deviceRule">
<el-form
class="-mb-15px"
:model="ruleQueryParams"
ref="ruleQueryFormRef"
:inline="true"
label-width="80px"
>
<el-form-item label="标识符" prop="identifier">
<el-input
v-model="ruleQueryParams.identifier"
placeholder="请输入标识符"
clearable
@keyup.enter="handleRuleQuery"
class="!w-200px"
/>
</el-form-item>
<el-form-item label="名称" prop="fieldName">
<el-input
v-model="ruleQueryParams.fieldName"
placeholder="请输入名称"
clearable
@keyup.enter="handleRuleQuery"
class="!w-200px"
/>
</el-form-item>
<el-form-item label="默认值" prop="defaultValue">
<el-input
v-model="ruleQueryParams.defaultValue"
placeholder="请输入默认值"
clearable
@keyup.enter="handleRuleQuery"
class="!w-200px"
/>
</el-form-item>
<el-form-item>
<el-button @click="handleRuleQuery">
<Icon icon="ep:search" class="mr-5px" /> 搜索
</el-button>
<el-button @click="resetRuleQuery">
<Icon icon="ep:refresh" class="mr-5px" /> 重置
</el-button>
</el-form-item>
</el-form>
<div class="mb-10px text-right">
<el-button type="primary" @click="openCreateRuleForm">
新增告警规则
</el-button>
</div>
<el-table
v-loading="ruleLoading"
:data="ruleList"
:stripe="true"
:show-overflow-tooltip="true"
row-key="id"
>
<el-table-column label="标识符" align="center" prop="identifier" />
<el-table-column label="名称" align="center" prop="fieldName" />
<el-table-column label="规则" align="center" prop="fieldRule" />
<el-table-column label="默认值" align="center" prop="defaultValue" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center" width="160px">
<template #default="scope">
<el-button link type="primary" @click="openRuleForm(scope.row)">
编辑
</el-button>
<el-button
v-if="(scope.row.identifier || '').toString().toUpperCase() === 'ALARM'"
link
type="danger"
@click="handleRuleDelete(scope.row.id)"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<Pagination
:total="ruleTotal"
v-model:page="ruleQueryParams.pageNo"
v-model:limit="ruleQueryParams.pageSize"
@pagination="getRuleList"
/>
<el-dialog v-model="ruleDialogVisible" title="编辑点位规则" width="880px" draggable>
<el-form :model="ruleForm" ref="ruleFormRef" label-width="90px">
<el-form-item label="标识符">
<el-input v-model="ruleForm.identifier" disabled />
</el-form-item>
<el-form-item label="名称">
<el-input v-model="ruleForm.fieldName" disabled />
</el-form-item>
<el-form-item label="默认值">
<el-input v-model="ruleForm.defaultValue" disabled />
</el-form-item>
<div class="flex flex-col w-full">
<div class="border border-gray-200 dark:border-gray-600 rounded-md py-12px">
<el-form-item label="点位规则">
<el-select
v-model="ruleForm.fieldRule"
placeholder="请选择点位规则"
class="!w-240px"
:disabled="!currentRuleOptions.length"
>
<el-option
v-for="item in currentRuleOptions"
:key="item.value"
:label="item.label"
:value="item.value"
:disabled="isRuleDisabled(item.value, ruleForm.fieldRule)"
/>
</el-select>
</el-form-item>
<el-form-item label="规则">
<div class="flex items-center gap-8px">
<el-select
v-model="ruleForm.ruleAttributeId"
placeholder="请选择点位"
class="!w-240px"
>
<el-option
v-for="item in ruleAttributeOptions"
:key="item.id"
:label="item.attributeName || item.attributeCode"
:value="item.id"
/>
</el-select>
<el-select
v-model="ruleForm.ruleOperator"
placeholder="请选择条件"
class="!w-160px"
>
<el-option
v-for="item in ruleOperatorOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
<el-input
v-if="ruleForm.ruleOperator !== 'TRUE' && ruleForm.ruleOperator !== 'FALSE'"
v-model="ruleForm.ruleValue"
placeholder="请输入符号值"
class="!w-200px"
/>
</div>
</el-form-item>
</div>
<div
v-for="(item, index) in extraPointRules"
:key="index"
class="border border-gray-200 dark:border-gray-600 rounded-md px-16px py-12px"
>
<el-form-item label="点位规则">
<el-select
v-model="item.rule"
placeholder="请选择点位规则"
class="!w-240px"
>
<el-option
v-for="opt in currentRuleOptions"
:key="opt.value"
:label="opt.label"
:value="opt.value"
:disabled="isRuleDisabled(opt.value, item.rule)"
/>
</el-select>
</el-form-item>
<el-form-item label="规则">
<div class="flex items-center gap-8px">
<el-select
v-model="item.id"
placeholder="请选择点位"
class="!w-240px"
>
<el-option
v-for="attr in ruleAttributeOptions"
:key="attr.id"
:label="attr.attributeName || attr.attributeCode"
:value="attr.id"
/>
</el-select>
<el-select
v-model="item.operator"
placeholder="请选择条件"
class="!w-160px"
>
<el-option
v-for="opt in ruleOperatorOptions"
:key="opt.value"
:label="opt.label"
:value="opt.value"
/>
</el-select>
<el-input
v-if="item.operator !== 'TRUE' && item.operator !== 'FALSE'"
v-model="item.operatorRule"
placeholder="请输入符号值"
class="!w-200px"
/>
<el-button type="danger" link @click="handleRemovePointRule(index)">
删除
</el-button>
</div>
</el-form-item>
</div>
<el-form-item v-if="isRunningIdentifier" label=" ">
<el-button type="primary" link @click="handleAddPointRule">
+ 添加规则
</el-button>
</el-form-item>
</div>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="ruleDialogVisible = false"> </el-button>
<el-button type="primary" :loading="ruleFormLoading" @click="handleRuleSubmit"> </el-button>
</span>
</template>
</el-dialog>
<el-dialog v-model="createRuleDialogVisible" title="新增告警规则" width="520px" draggable>
<el-form :model="createRuleForm" ref="createRuleFormRef" label-width="90px">
<el-form-item label="标识符">
<el-input v-model="createRuleForm.identifier" disabled />
</el-form-item>
<el-form-item label="名称">
<el-input v-model="createRuleForm.fieldName" placeholder="请输入名称" />
</el-form-item>
<el-form-item label="默认值">
<el-input v-model="createRuleForm.defaultValue" disabled />
</el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="createRuleDialogVisible = false"> </el-button>
<el-button type="primary" :loading="createRuleFormLoading" @click="handleCreateRuleSubmit">
</el-button>
</span>
</template>
</el-dialog>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</template>
<el-empty v-else description="请点击设备列表的“点位”查看采集点和点位规则" />
</ContentWrap> </ContentWrap>
</template> </template>
@ -158,6 +417,7 @@ link :type="isRowConnected(scope.row) ? 'warning' : 'success'"
import { getStrDictOptions, DICT_TYPE } from '@/utils/dict' import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime' import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download' import download from '@/utils/download'
import request from '@/config/axios'
import { DeviceApi, DeviceConnectParams, DeviceVO } from '@/api/iot/device' import { DeviceApi, DeviceConnectParams, DeviceVO } from '@/api/iot/device'
import DeviceForm from './DeviceForm.vue' import DeviceForm from './DeviceForm.vue'
import DeviceAttributeList from './components/DeviceAttributeList.vue' import DeviceAttributeList from './components/DeviceAttributeList.vue'
@ -288,14 +548,30 @@ const handleExport = async () => {
} }
} }
interface DevicePointRuleVO {
id: number
identifier: string
fieldName: string
fieldRule: string
defaultValue: string
deviceId: number
createTime?: string | number | Date
ruleAttributeId?: number
ruleOperator?: string
ruleValue?: string | number
}
const attributeDeviceId = ref<number | undefined>(undefined) const attributeDeviceId = ref<number | undefined>(undefined)
const attributeDeviceName = ref('') const attributeDeviceName = ref('')
const deviceTabActive = ref('deviceAttribute')
const deviceAttributeTabLabel = computed(() => { const deviceAttributeTabLabel = computed(() => {
if (!attributeDeviceId.value) {
return '设备属性' return '设备属性'
} })
return attributeDeviceName.value ? `设备属性:${attributeDeviceName.value}` : '设备属性'
const deviceRuleTabLabel = computed(() => {
return '点位规则'
}) })
const handleShowAttribute = (row: any) => { const handleShowAttribute = (row: any) => {
@ -303,6 +579,333 @@ const handleShowAttribute = (row: any) => {
attributeDeviceName.value = row?.deviceName ?? '' attributeDeviceName.value = row?.deviceName ?? ''
} }
const ruleLoading = ref(false)
const ruleList = ref<DevicePointRuleVO[]>([])
const ruleTotal = ref(0)
const ruleQueryParams = reactive({
pageNo: 1,
pageSize: 10,
identifier: undefined as string | undefined,
fieldName: undefined as string | undefined,
fieldRule: undefined as string | undefined,
defaultValue: undefined as string | undefined,
deviceId: undefined as number | undefined,
})
const ruleQueryFormRef = ref()
const ruleAttributeOptions = ref<any[]>([])
const getRuleList = async () => {
if (!attributeDeviceId.value) return
ruleLoading.value = true
try {
const params = {
...ruleQueryParams,
deviceId: attributeDeviceId.value,
}
const data = await request.get({ url: '/iot/device-point-rules/page', params })
const listData = Array.isArray((data as any)?.list) ? (data as any).list : (Array.isArray(data) ? data : [])
const totalData = (data as any)?.total ?? listData.length
ruleList.value = listData as DevicePointRuleVO[]
ruleTotal.value = totalData
} finally {
ruleLoading.value = false
}
}
const handleRuleQuery = () => {
if (!attributeDeviceId.value) return
ruleQueryParams.pageNo = 1
getRuleList()
}
const resetRuleQuery = () => {
if (!attributeDeviceId.value) return
ruleQueryFormRef.value?.resetFields?.()
handleRuleQuery()
}
const loadRuleAttributeOptions = async (deviceId: number) => {
try {
const res = await request.get({ url: '/iot/device-contact-model/list', params: { id: deviceId } })
const data = Array.isArray(res) ? res : (res as any)?.list ?? []
ruleAttributeOptions.value = data as any[]
} catch {
ruleAttributeOptions.value = []
}
}
watch(
() => attributeDeviceId.value,
async (val) => {
ruleQueryParams.deviceId = val ?? undefined
if (!val) {
ruleList.value = []
ruleTotal.value = 0
ruleAttributeOptions.value = []
return
}
ruleQueryParams.pageNo = 1
await getRuleList()
}
)
const ruleDialogVisible = ref(false)
const ruleFormLoading = ref(false)
const ruleFormRef = ref()
const ruleForm = reactive<Partial<DevicePointRuleVO>>({
id: undefined,
identifier: '',
fieldName: '',
fieldRule: '',
defaultValue: '',
deviceId: undefined,
ruleAttributeId: undefined,
ruleOperator: undefined,
ruleValue: undefined,
})
const extraPointRules = ref<
Array<{
id?: number
rule?: string
operator?: string
operatorRule?: string | number
}>
>([])
const runningRuleOptions = [
{ value: '1', label: '运行' },
{ value: '2', label: '待机中(不运行、没故障)' },
{ value: '3', label: '故障中(故障且待机)' },
{ value: '4', label: '报警中(故障且运行)' },
]
const alarmRuleOptions = [{ value: 'ALARM', label: '报警' }]
const currentRuleOptions = computed(() => {
const id = (ruleForm.identifier || '').toString().toUpperCase()
if (id === 'RUNNING') return runningRuleOptions
if (id === 'ALARM') return alarmRuleOptions
return []
})
const isRuleDisabled = (value: string, selfRule?: string | number) => {
if (!value) return false
const v = String(value)
const self = selfRule != null ? String(selfRule) : undefined
if (self === v) return false
if (ruleForm.fieldRule && String(ruleForm.fieldRule) === v && self !== v) return true
if (
extraPointRules.value.some(
(item) => item.rule != null && String(item.rule) === v && String(item.rule) !== self
)
) {
return true
}
return false
}
const ruleOperatorOptions = computed(() => getStrDictOptions('czsb_rules_conditions'))
const isRunningIdentifier = computed(() => {
return (ruleForm.identifier || '').toString().toUpperCase() === 'RUNNING'
})
const openRuleForm = async (row: DevicePointRuleVO & { pointRulesVOList?: any[] }) => {
const deviceId = row.deviceId || attributeDeviceId.value
if (!deviceId) {
message.error('设备信息缺失,无法加载点位规则')
return
}
await loadRuleAttributeOptions(deviceId)
ruleForm.id = row.id
ruleForm.identifier = row.identifier
ruleForm.fieldName = row.fieldName
ruleForm.defaultValue = row.defaultValue
ruleForm.deviceId = row.deviceId
extraPointRules.value = []
const list = Array.isArray(row.pointRulesVOList) ? row.pointRulesVOList : []
if (list.length) {
const first = list[0] as any
const firstRule = first.rule ?? row.fieldRule
const firstAttrId = (() => {
if (first && first.code != null) {
const target = ruleAttributeOptions.value.find(
(item) => item.attributeCode === first.code
)
return target?.id
}
if (first && first.id != null) return first.id
return undefined
})()
ruleForm.fieldRule = firstRule as any
ruleForm.ruleAttributeId = firstAttrId as any
ruleForm.ruleOperator = first.operator as any
ruleForm.ruleValue = first.operatorRule as any
extraPointRules.value = list.slice(1).map((item: any) => ({
id: (() => {
if (item && item.code != null) {
const target = ruleAttributeOptions.value.find(
(opt) => opt.attributeCode === item.code
)
return target?.id
}
if (item && item.id != null) return item.id
return undefined
})(),
rule: item.rule,
operator: item.operator,
operatorRule: item.operatorRule,
}))
} else {
ruleForm.fieldRule = row.fieldRule
ruleForm.ruleAttributeId = row.ruleAttributeId
ruleForm.ruleOperator = row.ruleOperator
ruleForm.ruleValue = row.ruleValue as any
}
const options = currentRuleOptions.value
if (options.length && !options.some((item) => item.value === ruleForm.fieldRule)) {
ruleForm.fieldRule = options[0].value
}
ruleDialogVisible.value = true
}
const handleRuleSubmit = async () => {
if (!ruleForm.id) return
try {
ruleFormLoading.value = true
const pointRulesVOList: any[] = []
if (ruleForm.ruleAttributeId && ruleForm.ruleOperator) {
const attr = ruleAttributeOptions.value.find(
(item) => item.id === ruleForm.ruleAttributeId
)
if (attr && attr.attributeCode) {
pointRulesVOList.push({
code: attr.attributeCode,
rule: ruleForm.fieldRule,
operator: ruleForm.ruleOperator,
operatorRule: ruleForm.ruleValue,
})
}
}
extraPointRules.value.forEach((item) => {
if (!item.id || !item.operator) return
const attr = ruleAttributeOptions.value.find((opt) => opt.id === item.id)
if (!attr || !attr.attributeCode) return
pointRulesVOList.push({
code: attr.attributeCode,
rule: item.rule ?? ruleForm.fieldRule,
operator: item.operator,
operatorRule: item.operatorRule,
})
})
const payload = {
id: ruleForm.id,
identifier: ruleForm.identifier,
fieldName: ruleForm.fieldName,
fieldRule: ruleForm.fieldRule,
defaultValue: ruleForm.defaultValue,
deviceId: ruleForm.deviceId ?? attributeDeviceId.value,
pointRulesVOList,
}
await request.put({ url: '/iot/device-point-rules/update', data: payload })
message.success('保存成功')
ruleDialogVisible.value = false
await getRuleList()
} finally {
ruleFormLoading.value = false
}
}
const handleRuleDelete = async (id: number) => {
if (!id) return
try {
await message.delConfirm()
await request.delete({ url: '/iot/device-point-rules/delete?id=' + id })
message.success(t('common.delSuccess'))
await getRuleList()
} catch { }
}
const handleAddPointRule = () => {
if (!isRunningIdentifier.value) return
const allOptions = currentRuleOptions.value || []
const used = new Set<string>()
if (ruleForm.fieldRule) used.add(String(ruleForm.fieldRule))
extraPointRules.value.forEach((item) => {
if (item.rule != null) used.add(String(item.rule))
})
const next = allOptions.find((opt) => !used.has(String(opt.value)))
if (!next) {
message.warning('已没有可用的点位规则可选')
return
}
extraPointRules.value.push({
rule: next.value as any,
id: undefined,
operator: undefined,
operatorRule: undefined,
})
}
const handleRemovePointRule = (index: number) => {
if (index < 0 || index >= extraPointRules.value.length) return
extraPointRules.value.splice(index, 1)
}
const createRuleDialogVisible = ref(false)
const createRuleFormLoading = ref(false)
const createRuleFormRef = ref()
const createRuleForm = reactive({
identifier: 'ALARM',
fieldName: '',
defaultValue: '报警',
})
const openCreateRuleForm = () => {
if (!attributeDeviceId.value) {
message.error('请先选择设备')
return
}
createRuleForm.identifier = 'ALARM'
createRuleForm.fieldName = '报警'
createRuleForm.defaultValue = '报警'
createRuleDialogVisible.value = true
}
const handleCreateRuleSubmit = async () => {
if (!attributeDeviceId.value) return
if (!createRuleForm.fieldName) {
message.warning('请输入名称')
return
}
try {
createRuleFormLoading.value = true
const payload = {
identifier: createRuleForm.identifier,
fieldName: createRuleForm.fieldName,
defaultValue: createRuleForm.defaultValue,
deviceId: attributeDeviceId.value,
}
await request.post({ url: '/iot/device-point-rules/create', data: payload })
message.success('新增成功')
createRuleDialogVisible.value = false
await getRuleList()
} finally {
createRuleFormLoading.value = false
}
}
const connectLoadingMap = reactive<Record<number, boolean>>({}) const connectLoadingMap = reactive<Record<number, boolean>>({})
const getRowConnectValue = (row: any) => { const getRowConnectValue = (row: any) => {

@ -149,6 +149,12 @@ link type="primary" @click="openForm('update', scope.row.id)"
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="mb-10px text-right">
<el-button type="primary" @click="openCreateRuleForm">
新增告警规则
</el-button>
</div>
<el-table <el-table
v-loading="ruleLoading" v-loading="ruleLoading"
:data="ruleList" :data="ruleList"
@ -161,11 +167,19 @@ link type="primary" @click="openForm('update', scope.row.id)"
<el-table-column label="规则" align="center" prop="fieldRule" /> <el-table-column label="规则" align="center" prop="fieldRule" />
<el-table-column label="默认值" align="center" prop="defaultValue" /> <el-table-column label="默认值" align="center" prop="defaultValue" />
<el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180px" /> <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
<el-table-column label="操作" align="center" width="120px"> <el-table-column label="操作" align="center" width="160px">
<template #default="scope"> <template #default="scope">
<el-button link type="primary" @click="openRuleForm(scope.row)"> <el-button link type="primary" @click="openRuleForm(scope.row)">
编辑 编辑
</el-button> </el-button>
<el-button
v-if="(scope.row.identifier || '').toString().toUpperCase() === 'ALARM'"
link
type="danger"
@click="handleRuleDelete(scope.row.id)"
>
删除
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -189,7 +203,7 @@ link type="primary" @click="openForm('update', scope.row.id)"
</el-form-item> </el-form-item>
<div class="flex flex-col w-full"> <div class="flex flex-col w-full">
<div class="border border-gray-200 dark:border-gray-600 rounded-md px-16px py-12px"> <div class="border border-gray-200 dark:border-gray-600 rounded-md py-12px">
<el-form-item label="点位规则"> <el-form-item label="点位规则">
<el-select <el-select
v-model="ruleForm.fieldRule" v-model="ruleForm.fieldRule"
@ -226,13 +240,14 @@ link type="primary" @click="openForm('update', scope.row.id)"
class="!w-160px" class="!w-160px"
> >
<el-option <el-option
v-for="item in ruleOperatorOptions" v-for="opt in ruleOperatorOptions"
:key="item.value" :key="opt.value"
:label="item.label" :label="opt.label"
:value="item.value" :value="opt.value"
/> />
</el-select> </el-select>
<el-input <el-input
v-if="ruleForm.ruleOperator !== 'TRUE' && ruleForm.ruleOperator !== 'FALSE'"
v-model="ruleForm.ruleValue" v-model="ruleForm.ruleValue"
placeholder="请输入符号值" placeholder="请输入符号值"
class="!w-200px" class="!w-200px"
@ -288,6 +303,7 @@ link type="primary" @click="openForm('update', scope.row.id)"
/> />
</el-select> </el-select>
<el-input <el-input
v-if="item.operator !== 'TRUE' && item.operator !== 'FALSE'"
v-model="item.operatorRule" v-model="item.operatorRule"
placeholder="请输入符号值" placeholder="请输入符号值"
class="!w-200px" class="!w-200px"
@ -313,6 +329,28 @@ link type="primary" @click="openForm('update', scope.row.id)"
</span> </span>
</template> </template>
</el-dialog> </el-dialog>
<el-dialog v-model="createRuleDialogVisible" title="新增告警规则" width="520px" draggable>
<el-form :model="createRuleForm" ref="createRuleFormRef" label-width="90px">
<el-form-item label="标识符">
<el-input v-model="createRuleForm.identifier" disabled />
</el-form-item>
<el-form-item label="名称">
<el-input v-model="createRuleForm.fieldName" placeholder="请输入名称" />
</el-form-item>
<el-form-item label="默认值">
<el-input v-model="createRuleForm.defaultValue" disabled />
</el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="createRuleDialogVisible = false"> </el-button>
<el-button type="primary" :loading="createRuleFormLoading" @click="handleCreateRuleSubmit">
</el-button>
</span>
</template>
</el-dialog>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</template> </template>
@ -546,6 +584,15 @@ const ruleForm = reactive<Partial<DeviceModelRuleVO>>({
ruleValue: undefined, ruleValue: undefined,
}) })
const createRuleDialogVisible = ref(false)
const createRuleFormLoading = ref(false)
const createRuleFormRef = ref()
const createRuleForm = reactive({
identifier: 'ALARM',
fieldName: '',
defaultValue: '报警',
})
const extraPointRules = ref< const extraPointRules = ref<
Array<{ Array<{
id?: number id?: number
@ -589,19 +636,32 @@ const isRuleDisabled = (value: string, selfRule?: string | number) => {
return false return false
} }
const ruleOperatorOptions = [ const ruleOperatorOptions = computed(() => getStrDictOptions('czsb_rules_conditions'))
{ value: 'TRUE', label: '为真' },
{ value: 'FALSE', label: '为假' },
{ value: 'EQ', label: '等于' },
{ value: 'LE', label: '小于等于' },
{ value: 'GE', label: '大于等于' },
]
const isRunningIdentifier = computed(() => { const isRunningIdentifier = computed(() => {
return (ruleForm.identifier || '').toString().toUpperCase() === 'RUNNING' return (ruleForm.identifier || '').toString().toUpperCase() === 'RUNNING'
}) })
const openRuleForm = (row: DeviceModelRuleVO & { pointRulesVOList?: any[] }) => { const openCreateRuleForm = () => {
if (!attributeModelId.value) {
message.error('请先选择模型')
return
}
createRuleForm.identifier = 'ALARM'
createRuleForm.fieldName = '报警'
createRuleForm.defaultValue = '报警'
createRuleDialogVisible.value = true
}
const openRuleForm = async (row: DeviceModelRuleVO & { pointRulesVOList?: any[] }) => {
const modelId = row.modelId || attributeModelId.value
if (!modelId) {
message.error('模型信息缺失,无法加载点位规则')
return
}
await loadRuleAttributeOptions(modelId)
ruleForm.id = row.id ruleForm.id = row.id
ruleForm.identifier = row.identifier ruleForm.identifier = row.identifier
ruleForm.fieldName = row.fieldName ruleForm.fieldName = row.fieldName
@ -614,12 +674,32 @@ const openRuleForm = (row: DeviceModelRuleVO & { pointRulesVOList?: any[] }) =>
if (list.length) { if (list.length) {
const first = list[0] as any const first = list[0] as any
ruleForm.fieldRule = (first.rule ?? row.fieldRule) as any const firstRule = first.rule ?? row.fieldRule
ruleForm.ruleAttributeId = first.id as any const firstAttrId = (() => {
if (first && first.code != null) {
const target = ruleAttributeOptions.value.find(
(item) => item.attributeCode === first.code
)
return target?.id
}
if (first && first.id != null) return first.id
return undefined
})()
ruleForm.fieldRule = firstRule as any
ruleForm.ruleAttributeId = firstAttrId as any
ruleForm.ruleOperator = first.operator as any ruleForm.ruleOperator = first.operator as any
ruleForm.ruleValue = first.operatorRule as any ruleForm.ruleValue = first.operatorRule as any
extraPointRules.value = list.slice(1).map((item: any) => ({ extraPointRules.value = list.slice(1).map((item: any) => ({
id: item.id, id: (() => {
if (item && item.code != null) {
const target = ruleAttributeOptions.value.find(
(opt) => opt.attributeCode === item.code
)
return target?.id
}
if (item && item.id != null) return item.id
return undefined
})(),
rule: item.rule, rule: item.rule,
operator: item.operator, operator: item.operator,
operatorRule: item.operatorRule, operatorRule: item.operatorRule,
@ -645,18 +725,25 @@ const handleRuleSubmit = async () => {
const pointRulesVOList: any[] = [] const pointRulesVOList: any[] = []
if (ruleForm.ruleAttributeId && ruleForm.ruleOperator) { if (ruleForm.ruleAttributeId && ruleForm.ruleOperator) {
const attr = ruleAttributeOptions.value.find(
(item) => item.id === ruleForm.ruleAttributeId
)
if (attr && attr.attributeCode) {
pointRulesVOList.push({ pointRulesVOList.push({
id: ruleForm.ruleAttributeId, code: attr.attributeCode,
rule: ruleForm.fieldRule, rule: ruleForm.fieldRule,
operator: ruleForm.ruleOperator, operator: ruleForm.ruleOperator,
operatorRule: ruleForm.ruleValue, operatorRule: ruleForm.ruleValue,
}) })
} }
}
extraPointRules.value.forEach((item) => { extraPointRules.value.forEach((item) => {
if (!item.id || !item.operator) return if (!item.id || !item.operator) return
const attr = ruleAttributeOptions.value.find((opt) => opt.id === item.id)
if (!attr || !attr.attributeCode) return
pointRulesVOList.push({ pointRulesVOList.push({
id: item.id, code: attr.attributeCode,
rule: item.rule ?? ruleForm.fieldRule, rule: item.rule ?? ruleForm.fieldRule,
operator: item.operator, operator: item.operator,
operatorRule: item.operatorRule, operatorRule: item.operatorRule,
@ -667,7 +754,6 @@ const handleRuleSubmit = async () => {
id: ruleForm.id, id: ruleForm.id,
identifier: ruleForm.identifier, identifier: ruleForm.identifier,
fieldName: ruleForm.fieldName, fieldName: ruleForm.fieldName,
fieldRule: ruleForm.fieldRule,
defaultValue: ruleForm.defaultValue, defaultValue: ruleForm.defaultValue,
modelId: ruleForm.modelId, modelId: ruleForm.modelId,
pointRulesVOList, pointRulesVOList,
@ -682,6 +768,16 @@ const handleRuleSubmit = async () => {
} }
} }
const handleRuleDelete = async (id: number) => {
if (!id) return
try {
await message.delConfirm()
await request.delete({ url: '/iot/device-model-rules/delete?id=' + id })
message.success(t('common.delSuccess'))
await getRuleList()
} catch { }
}
const handleAddPointRule = () => { const handleAddPointRule = () => {
if (!isRunningIdentifier.value) return if (!isRunningIdentifier.value) return
const allOptions = currentRuleOptions.value || [] const allOptions = currentRuleOptions.value || []
@ -703,6 +799,29 @@ const handleAddPointRule = () => {
}) })
} }
const handleCreateRuleSubmit = async () => {
if (!attributeModelId.value) return
if (!createRuleForm.fieldName) {
message.warning('请输入名称')
return
}
try {
createRuleFormLoading.value = true
const payload = {
identifier: createRuleForm.identifier,
fieldName: createRuleForm.fieldName,
defaultValue: createRuleForm.defaultValue,
modelId: attributeModelId.value,
}
await request.post({ url: '/iot/device-model-rules/create', data: payload })
message.success('新增成功')
createRuleDialogVisible.value = false
await getRuleList()
} finally {
createRuleFormLoading.value = false
}
}
const handleRemovePointRule = (index: number) => { const handleRemovePointRule = (index: number) => {
if (index < 0 || index >= extraPointRules.value.length) return if (index < 0 || index >= extraPointRules.value.length) return
extraPointRules.value.splice(index, 1) extraPointRules.value.splice(index, 1)

@ -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}`
@ -1095,12 +1095,12 @@ onMounted(async () => {
.device-ledger-history-item { .device-ledger-history-item {
display: flex; display: flex;
flex-direction: column;
gap: 8px;
padding: 10px; padding: 10px;
background: var(--el-fill-color-blank);
border: 1px solid var(--el-border-color-lighter); border: 1px solid var(--el-border-color-lighter);
border-radius: 8px; border-radius: 8px;
background: var(--el-fill-color-blank); flex-direction: column;
gap: 8px;
} }
.device-ledger-history-item-head { .device-ledger-history-item-head {
@ -1143,19 +1143,19 @@ onMounted(async () => {
.device-ledger-history-item-image { .device-ledger-history-item-image {
width: 76px; width: 76px;
height: 76px; height: 76px;
border-radius: 6px;
overflow: hidden; overflow: hidden;
border-radius: 6px;
} }
.device-ledger-history-image-error { .device-ledger-history-image-error {
display: flex;
width: 100%; width: 100%;
height: 100%; height: 100%;
display: flex;
align-items: center;
justify-content: center;
font-size: 12px; font-size: 12px;
color: var(--el-text-color-secondary); color: var(--el-text-color-secondary);
background: var(--el-fill-color); background: var(--el-fill-color);
align-items: center;
justify-content: center;
} }
.device-ledger-repair-collapse { .device-ledger-repair-collapse {
@ -1175,8 +1175,8 @@ onMounted(async () => {
} }
.device-ledger-repair-meta { .device-ledger-repair-meta {
color: var(--el-text-color-secondary);
font-size: 12px; font-size: 12px;
color: var(--el-text-color-secondary);
} }
.device-ledger-history-item-text { .device-ledger-history-item-text {

@ -37,7 +37,7 @@ v-model="queryParams.timeRange" type="datetimerange" value-format="YYYY-MM-DD HH
<el-table <el-table
ref="tableRef" v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" row-key="id" ref="tableRef" v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" row-key="id"
:expand-row-keys="expandRowKeys" :row-class-name="getRowClassName" style="margin-top: 20px; min-height: 50vh" :expand-row-keys="expandRowKeys" :row-class-name="getRowClassName" style=" min-height: 50vh;margin-top: 20px"
@row-click="handleRowClick" @selection-change="handleSelectionChange"> @row-click="handleRowClick" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" /> <el-table-column type="selection" width="50" align="center" />
<el-table-column type="expand" width="52"> <el-table-column type="expand" width="52">

@ -415,23 +415,23 @@ const resetForm = () => {
.formula-config-panel { .formula-config-panel {
width: calc((100% - 96px) / 2); width: calc((100% - 96px) / 2);
border: 1px solid var(--el-border-color);
border-radius: 4px;
overflow: hidden; overflow: hidden;
background: var(--el-bg-color); background: var(--el-bg-color);
border: 1px solid var(--el-border-color);
border-radius: 4px;
} }
.formula-config-panel__header { .formula-config-panel__header {
display: flex; display: flex;
justify-content: space-between;
padding: 10px 12px; padding: 10px 12px;
border-bottom: 1px solid var(--el-border-color);
font-weight: 600; font-weight: 600;
border-bottom: 1px solid var(--el-border-color);
justify-content: space-between;
} }
.formula-config-panel__meta { .formula-config-panel__meta {
color: var(--el-text-color-secondary);
font-weight: 400; font-weight: 400;
color: var(--el-text-color-secondary);
} }
.formula-config-panel__filter { .formula-config-panel__filter {
@ -444,8 +444,8 @@ const resetForm = () => {
} }
.formula-config-actions { .formula-config-actions {
width: 96px;
display: flex; display: flex;
width: 96px;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
align-items: center; align-items: center;

Loading…
Cancel
Save