feat: 大屏多订单改为同屏并列展示,物料申请新增跨工位借料来源并移除工单完成日期

This commit is contained in:
SunYF
2026-11-02 19:17:05 +08:00
parent 0c03d32682
commit fd2f0e2767
77 changed files with 1773 additions and 664 deletions
@@ -64,33 +64,7 @@
</div>
</el-card>
<!-- 规则配置 -->
<el-card style="margin-top:14px">
<template #header>预警规则配置</template>
<el-table :data="rules" border size="small" v-loading="rulesLoading" empty-text="暂无规则">
<el-table-column prop="code" label="规则编码" width="180" />
<el-table-column prop="name" label="规则名称" min-width="160" />
<el-table-column label="启用" width="90" align="center">
<template #default="{row}">
<el-switch v-model="row.enabled" @change="saveRule(row)" />
</template>
</el-table-column>
<el-table-column label="阈值" width="200">
<template #default="{row}">
<el-input-number v-model="row.threshold" :min="0" :controls="false" style="width:120px" @change="saveRule(row)" />
<span class="unit">{{ thresholdUnit(row.code) }}</span>
</template>
</el-table-column>
<el-table-column label="备注" min-width="160">
<template #default="{row}">
<el-input v-model="row.remark" size="small" placeholder="可填写备注" @change="saveRule(row)" />
</template>
</el-table-column>
</el-table>
<div style="margin-top:8px;color:#999;font-size:12px">
说明:阈值仅对「来料检超期未检」(超期小时) 与「库龄超档」(超期天) 生效;其余规则阈值不参与判定。
</div>
</el-card>
<!-- 规则配置已迁独立「预警规则」菜单(2026-11-02 条目15:与 MES 预警中心/预警规则双菜单结构统一) -->
</div>
</template>
@@ -104,7 +78,8 @@ const ruleMeta = {
inspection_overdue: '来料检超期未检',
backup_overdue: '备份超期',
sync_failed: '物料同步失败',
inventory_age: '库龄超档'
inventory_age: '库龄超档',
negative_stock: '库存负数异常'
}
const levelMeta = { info: '信息', warning: '警告', error: '严重' }
function levelTag(l) {
@@ -112,11 +87,6 @@ function levelTag(l) {
if (l === 'warning') return 'warning'
return 'info'
}
function thresholdUnit(code) {
if (code === 'inspection_overdue') return '小时'
if (code === 'inventory_age') return '天'
return '(未使用)'
}
const list = ref([])
const total = ref(0)
@@ -127,9 +97,6 @@ const pageSize = ref(20)
const filters = reactive({ status: '', ruleCode: '' })
const rules = ref([])
const rulesLoading = ref(false)
function fmtTime(t) {
if (!t) return '-'
const d = new Date(t * 1000)
@@ -147,7 +114,7 @@ async function load() {
status: filters.status || undefined,
ruleCode: filters.ruleCode || undefined
}
const data = await request.get('/api/alerts', { params })
const data = await request.get('/alerts', { params })
list.value = (data && data.list) || []
total.value = (data && data.total) || 0
} catch (e) {
@@ -180,7 +147,7 @@ async function resolve(row) {
}
row._resolving = true
try {
await request.post(`/api/alerts/${row.id}/read`)
await request.post(`/alerts/${row.id}/read`)
ElMessage.success('已标记已读')
load()
} catch (e) {
@@ -199,7 +166,7 @@ async function readAll() {
}
readAllLoading.value = true
try {
await request.post('/api/alerts/read-all')
await request.post('/alerts/read-all')
ElMessage.success('已全部标记为已读')
load()
} catch (e) {
@@ -209,38 +176,8 @@ async function readAll() {
}
}
async function loadRules() {
rulesLoading.value = true
try {
const data = await request.get('/api/alert-rules')
rules.value = (data || []).map((r) => ({ ...r, enabled: !!r.enabled }))
} catch (e) {
ElMessage.error(e?.message || '加载规则失败')
} finally {
rulesLoading.value = false
}
}
let saveTimer = null
function saveRule(row) {
clearTimeout(saveTimer)
saveTimer = setTimeout(async () => {
try {
await request.post('/api/alert-rules/update', {
code: row.code,
enabled: row.enabled,
threshold: row.threshold,
remark: row.remark
})
ElMessage.success('规则已保存')
} catch (e) {
ElMessage.error(e?.message || '保存失败')
}
}, 300)
}
onMounted(() => {
load()
loadRules()
})
</script>