feat: 新增 AgvPoint 点位表及客户端,支持点位编码与接驳台绑定
This commit is contained in:
@@ -31,14 +31,40 @@ async function loadDocks() {
|
||||
loadingDocks.value = false
|
||||
}
|
||||
|
||||
// 手动派车可选的接驳台(来自接驳台主数据,仅启用项)
|
||||
const dockOptions = computed(() =>
|
||||
docks.value.filter((d) => d.status === 'ENABLED').map((d) => d.dockCode)
|
||||
)
|
||||
// 显示层统一(2026-10-17 裁定):库房接驳台一律显示「库房接驳台」,不显示 DOCK21/JBT21 编号
|
||||
// (DOCK21 仅作后端映射/提交值;PLC 侧对应点位于监控页同样只显示「库房接驳台」)
|
||||
const dockLabel = (code) => (String(code || '') === 'DOCK21' ? '库房接驳台' : code || '—')
|
||||
|
||||
/* ===================== AGV 点位(独立点位表,硬件真源) ===================== */
|
||||
const agvPoints = ref([])
|
||||
const loadingPoints = ref(false)
|
||||
async function loadAgvPoints() {
|
||||
loadingPoints.value = true
|
||||
try {
|
||||
const data = await request.get('/agv/points')
|
||||
agvPoints.value = Array.isArray(data) ? data : []
|
||||
} catch { agvPoints.value = [] }
|
||||
loadingPoints.value = false
|
||||
}
|
||||
// 启用点位下拉(派车源/目标可选)
|
||||
const pointOptions = computed(() => agvPoints.value.filter((p) => p.enabled).map((p) => p.positionCode))
|
||||
const pointMap = computed(() => {
|
||||
const m = {}
|
||||
agvPoints.value.forEach((p) => { m[p.positionCode] = p })
|
||||
return m
|
||||
})
|
||||
const pointLabel = (code) => (pointMap.value[String(code)]?.name) || String(code || '—')
|
||||
const savingPoint = ref(0)
|
||||
async function savePoint(p) {
|
||||
savingPoint.value = p.id
|
||||
try {
|
||||
await request.put(`/agv/points/${p.id}`, { name: p.name, enabled: p.enabled })
|
||||
ElMessage.success('已保存')
|
||||
await loadAgvPoints()
|
||||
} catch { /* 拦截器已提示 */ }
|
||||
savingPoint.value = 0
|
||||
}
|
||||
|
||||
/* ===================== AGV 任务列表 ===================== */
|
||||
const tasks = ref([])
|
||||
const taskTotal = ref(0)
|
||||
@@ -96,23 +122,49 @@ function batchSetDock(v) {
|
||||
ElMessage.success(`已批量设为 ${v}`)
|
||||
}
|
||||
|
||||
// 按 targetDock 分组统计(下发确认弹窗展示;编号经 dockLabel 转中文显示)
|
||||
// 按 targetDock(点位编码) 分组统计(下发确认弹窗展示;编码经 pointLabel 转显示名)
|
||||
const groupPreview = computed(() => {
|
||||
const g = {}
|
||||
for (const r of selected.value) {
|
||||
const d = r.targetDock || '未指定'
|
||||
g[d] = (g[d] || 0) + 1
|
||||
}
|
||||
return Object.entries(g).map(([dock, n]) => ({ dock: dock === '未指定' ? dock : dockLabel(dock), n }))
|
||||
return Object.entries(g).map(([dock, n]) => ({ dock: dock === '未指定' ? dock : pointLabel(dock), n }))
|
||||
})
|
||||
|
||||
async function submitAgv() {
|
||||
const rows = selected.value.filter((r) => r.targetDock)
|
||||
if (!rows.length) return ElMessage.warning('请至少选择一行且指定目标接驳台')
|
||||
if (!rows.length) return ElMessage.warning('请至少选择一行且指定目标点位')
|
||||
// 防撞强校验①:目标接驳台点位当前有托盘 → 拒派(避免小车与目标点已有托盘碰撞)
|
||||
const busy = rows.filter((r) => {
|
||||
const p = pointMap.value[r.targetDock]
|
||||
return p && p.isDock && p.hasPallet
|
||||
})
|
||||
if (busy.length) {
|
||||
const names = [...new Set(busy.map((r) => pointLabel(r.targetDock)))].join('、')
|
||||
return ElMessage.error(`目标接驳台有托盘,存在碰撞风险,禁止派车:${names}`)
|
||||
}
|
||||
// 防撞强校验②:已停用点位 → 直接拒派(与后端同口径,管理员停用即 AGV 不去,不提供确认放行)
|
||||
const disabled = rows.filter((r) => { const p = pointMap.value[r.targetDock]; return p && !p.enabled })
|
||||
if (disabled.length) {
|
||||
const names = [...new Set(disabled.map((r) => pointLabel(r.targetDock)))].join('、')
|
||||
return ElMessage.error(`目标点位已停用,禁止派车(请先在「产线管理」恢复启用):${names}`)
|
||||
}
|
||||
// 防撞强校验③:纯点位(无接驳台/无传感器)→ 强制二次确认
|
||||
const pure = rows.filter((r) => { const p = pointMap.value[r.targetDock]; return p && !p.isDock })
|
||||
if (pure.length) {
|
||||
const names = [...new Set(pure.map((r) => pointLabel(r.targetDock)))].join('、')
|
||||
try {
|
||||
await ElMessageBox.confirm(
|
||||
`以下目标点位:${names}。该点位无传感器,请确保现场安全。仍要派车吗?`,
|
||||
'防撞二次确认', { type: 'warning', confirmButtonText: '仍要派车', cancelButtonText: '取消' }
|
||||
)
|
||||
} catch { return }
|
||||
}
|
||||
const lines = groupPreview.value.map((g) => `· ${g.dock}:${g.n} 行`).join('\n')
|
||||
try {
|
||||
await ElMessageBox.confirm(
|
||||
`确认对 ${rows.length} 行叫料单手动派车?\n\n按目标接驳台分组:\n${lines}\n\n源点:${dockLabel(sourceDock.value)}\n操作人:${operator.value}\n\n注:仓库完成备料时系统已自动派车,本操作用于补派或对失败任务重试。`,
|
||||
`确认对 ${rows.length} 行叫料单手动派车?\n\n按目标点位分组:\n${lines}\n\n源点:${pointLabel(sourceDock.value)}\n操作人:${operator.value}\n\n注:仓库完成备料时系统已自动派车,本操作用于补派或对失败任务重试。`,
|
||||
'手动派车确认',
|
||||
{ type: 'warning', confirmButtonText: '确认派车', cancelButtonText: '取消' }
|
||||
)
|
||||
@@ -156,10 +208,14 @@ const agvMode = reactive({ mock: false, tip: '' })
|
||||
function canCancel(status) {
|
||||
return status === 'PENDING' || status === '1' || status === '2'
|
||||
}
|
||||
// 重试口径与后端 RetryAgvTask 对齐:FAILED(RCS 下发失败)与 PENDING(未成功下发到 RCS)均可重试
|
||||
function canRetry(status) {
|
||||
return status === 'FAILED' || status === 'PENDING'
|
||||
}
|
||||
|
||||
async function cancelTask(row) {
|
||||
const { value: reason } = await ElMessageBox.prompt(
|
||||
`确认取消 AGV 任务 ${row.taskNo}(${dockLabel(row.sourceDock)} → ${dockLabel(row.targetDock)})?`,
|
||||
`确认取消 AGV 任务 ${row.taskNo}(${pointLabel(row.sourceDock)} → ${pointLabel(row.targetDock)})?`,
|
||||
'取消 AGV 任务',
|
||||
{ type: 'warning', confirmButtonText: '确认取消', cancelButtonText: '返回', inputPlaceholder: '取消原因(选填)', inputValue: '' }
|
||||
).catch(() => ({ value: null }))
|
||||
@@ -171,6 +227,20 @@ async function cancelTask(row) {
|
||||
} catch { /* 拦截器已提示 */ }
|
||||
}
|
||||
|
||||
async function retryTask(row) {
|
||||
try {
|
||||
await ElMessageBox.confirm(
|
||||
`确认重试 AGV 任务 ${row.taskNo}(${pointLabel(row.sourceDock)} → ${pointLabel(row.targetDock)})?将重新向 RCS 下发。`,
|
||||
'重试 AGV 任务', { type: 'warning', confirmButtonText: '确认重试', cancelButtonText: '返回' }
|
||||
)
|
||||
} catch { return }
|
||||
try {
|
||||
await request.post('/agv/retry', { taskNo: row.taskNo }, withOperator())
|
||||
ElMessage.success('已重试派车')
|
||||
loadTasks(); loadAgvPoints()
|
||||
} catch { /* 拦截器已提示 */ }
|
||||
}
|
||||
|
||||
async function loadMode() {
|
||||
try {
|
||||
const m = await request.get('/agv/mode')
|
||||
@@ -179,13 +249,14 @@ async function loadMode() {
|
||||
} catch { /* 忽略 */ }
|
||||
}
|
||||
|
||||
onMounted(() => { loadDocks(); loadTasks(); loadMode() })
|
||||
onMounted(() => { loadDocks(); loadTasks(); loadMode(); loadAgvPoints() })
|
||||
|
||||
// 切 tab 重新加载对应数据(2026-10-19:lazy 页签切回不 reload,状态/叫料单会停留在旧数据)
|
||||
function onTabChange(name) {
|
||||
if (name === 'docks') loadDocks()
|
||||
else if (name === 'tasks') loadTasks()
|
||||
else if (name === 'dispatch') loadMrs()
|
||||
else if (name === 'points') loadAgvPoints()
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -232,10 +303,10 @@ function onTabChange(name) {
|
||||
<el-table-column prop="id" label="ID" width="70" align="center" />
|
||||
<el-table-column prop="taskNo" label="任务号" width="150" />
|
||||
<el-table-column label="源" width="80" align="center">
|
||||
<template #default="{ row }">{{ dockLabel(row.sourceDock) }}</template>
|
||||
<template #default="{ row }">{{ pointLabel(row.sourceDock) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="目标" width="80" align="center">
|
||||
<template #default="{ row }">{{ dockLabel(row.targetDock) }}</template>
|
||||
<template #default="{ row }">{{ pointLabel(row.targetDock) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="状态" width="100" align="center">
|
||||
<template #default="{ row }">
|
||||
@@ -264,14 +335,15 @@ function onTabChange(name) {
|
||||
<el-table-column prop="operator" label="下发人" width="100" />
|
||||
<el-table-column prop="hikTaskCode" label="RCS任务码" width="150" show-overflow-tooltip />
|
||||
<el-table-column prop="remark" label="备注" min-width="140" show-overflow-tooltip />
|
||||
<el-table-column label="操作" width="90" align="center" fixed="right">
|
||||
<el-table-column label="操作" width="110" align="center" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<el-popconfirm v-if="canCancel(row.status)" title="确认取消该 AGV 任务?" @confirm="cancelTask(row)">
|
||||
<template #reference>
|
||||
<el-button size="small" type="danger" link>取消</el-button>
|
||||
</template>
|
||||
</el-popconfirm>
|
||||
<span v-else>-</span>
|
||||
<el-button v-if="canRetry(row.status)" size="small" type="warning" link @click="retryTask(row)">重试</el-button>
|
||||
<span v-if="!canCancel(row.status) && !canRetry(row.status)">-</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -292,13 +364,13 @@ function onTabChange(name) {
|
||||
<el-option label="已取消" value="CANCELLED" />
|
||||
</el-select>
|
||||
<el-button @click="loadMrs()">查询</el-button>
|
||||
<span class="tip">勾选叫料单行 → 行内可改目标接驳台 → 派车</span>
|
||||
<span class="tip">勾选叫料单行 → 行内可改目标点位 → 派车</span>
|
||||
</div>
|
||||
<div class="toolbar">
|
||||
<el-select v-model="sourceDock" style="width: 150px" placeholder="请选择接驳台">
|
||||
<el-option v-for="d in dockOptions" :key="d" :label="dockLabel(d)" :value="d" />
|
||||
<el-select v-model="sourceDock" style="width: 150px" placeholder="请选择源点位">
|
||||
<el-option v-for="d in pointOptions" :key="d" :label="pointLabel(d)" :value="d" />
|
||||
</el-select>
|
||||
<el-button v-for="d in dockOptions.slice(0, 2)" :key="'b'+d" @click="batchSetDock(d)">批量设 {{ dockLabel(d) }}</el-button>
|
||||
<el-button v-for="d in pointOptions.slice(0, 2)" :key="'b'+d" @click="batchSetDock(d)">批量设 {{ pointLabel(d) }}</el-button>
|
||||
<el-button type="primary" :disabled="!selected.length" @click="submitAgv">派车选中</el-button>
|
||||
<span class="tip" v-if="groupPreview.length">将生成:{{ groupPreview.map((g) => g.dock + '×' + g.n).join(',') }}</span>
|
||||
</div>
|
||||
@@ -310,10 +382,10 @@ function onTabChange(name) {
|
||||
<el-table-column prop="reqQty" label="数量" width="80" align="right" />
|
||||
<el-table-column prop="unit" label="单位" width="60" align="center" />
|
||||
<el-table-column prop="stationNo" label="工位" width="70" align="center" />
|
||||
<el-table-column label="目标接驳台" width="130">
|
||||
<el-table-column label="目标点位" width="150">
|
||||
<template #default="{ row }">
|
||||
<el-select :model-value="row.targetDock || ''" placeholder="选择" size="small" @change="(v) => changeDock(row, v)">
|
||||
<el-option v-for="d in dockOptions" :key="d" :label="dockLabel(d)" :value="d" />
|
||||
<el-option v-for="d in pointOptions" :key="d" :label="pointLabel(d)" :value="d" />
|
||||
</el-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@@ -326,6 +398,44 @@ function onTabChange(name) {
|
||||
</template>
|
||||
</el-table>
|
||||
</el-tab-pane>
|
||||
|
||||
<!-- ④ AGV 点位管理(独立点位表:硬件映射编码/接驳台绑定不可改,仅显示名与启用可编辑) -->
|
||||
<el-tab-pane label="点位管理" name="points" lazy>
|
||||
<div class="toolbar">
|
||||
<el-button type="primary" :loading="loadingPoints" @click="loadAgvPoints">刷新</el-button>
|
||||
<span class="tip">硬件映射点位编码与接驳台绑定不可改(置灰);仅「显示名」与「启用」可编辑</span>
|
||||
</div>
|
||||
<el-table :data="agvPoints" v-loading="loadingPoints" border stripe>
|
||||
<el-table-column label="点位编码(硬件)" width="170">
|
||||
<template #default="{ row }"><span class="mono disabled-text">{{ row.positionCode }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="显示名" min-width="220">
|
||||
<template #default="{ row }"><el-input v-model="row.name" size="small" :disabled="savingPoint === row.id" /></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="类型" width="110" align="center">
|
||||
<template #default="{ row }"><el-tag :type="row.isDock ? 'warning' : 'info'">{{ row.isDock ? '接驳台点位' : '纯点位' }}</el-tag></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="绑定接驳台" width="140" align="center">
|
||||
<template #default="{ row }"><span :class="{ 'disabled-text': row.isDock }">{{ row.isDock ? (row.dockCode || '—') : '—' }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="托盘在位" width="100" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-tag v-if="row.isDock" :type="row.hasPallet ? 'danger' : 'success'">{{ row.hasPallet ? '有托盘' : '空闲' }}</el-tag>
|
||||
<span v-else>—</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="启用" width="90" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-switch :model-value="row.enabled" :loading="savingPoint === row.id" @change="(v) => { row.enabled = v; savePoint(row) }" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="90" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-button size="small" type="primary" :loading="savingPoint === row.id" @click="savePoint(row)">保存</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
</div>
|
||||
</template>
|
||||
@@ -344,4 +454,6 @@ function onTabChange(name) {
|
||||
.dock-status { font-size: 13px; font-weight: 600; color: #67c23a; }
|
||||
.dock-card.busy .dock-status { color: #e6a23c; }
|
||||
.dock-ref { font-size: 12px; color: #e6a23c; margin-top: 2px; }
|
||||
.mono { font-family: Consolas, Monaco, monospace; }
|
||||
.disabled-text { color: #909399; }
|
||||
</style>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<el-card>
|
||||
<el-alert type="info" :closable="false" style="margin-bottom:12px"
|
||||
title="工位组合下发:把某工单/工件要经过的「工位组合」写入产线设备(如 PLC 控制器),产线传送带据此只停靠对应工位。工位组合由工单「工艺组合」按工位号升序自动派生,无需手动选择;如需调整路线,请到「工单管理」编辑工单的工艺组合。系统保证「上一条未收到完成信号前不下发下一条」,避免串序。" />
|
||||
title="工位下发:把某工单/工件要经过的「工位组合」写入产线设备(如 PLC 控制器),产线传送带据此只停靠对应工位。工位组合由工单「工艺组合」按工位号升序自动派生,无需手动选择;如需调整路线,请到「工单管理」编辑工单的工艺组合。系统保证「上一条未收到完成信号前不下发下一条」,避免串序;下错可在「下发记录」撤回,PLC 完成信号丢失时可人工完成收口。" />
|
||||
|
||||
<el-tabs v-model="tab" @tab-change="onTab">
|
||||
<!-- Tab1 下发录入(前,默认打开) -->
|
||||
@@ -41,6 +41,7 @@
|
||||
<el-select v-model="query.status" clearable placeholder="全部" style="width:120px">
|
||||
<el-option label="已下发" value="SENT" />
|
||||
<el-option label="已完成" value="DONE" />
|
||||
<el-option label="已撤回" value="CANCELLED" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item><el-button @click="loadLogs">刷新</el-button></el-form-item>
|
||||
@@ -53,7 +54,7 @@
|
||||
<el-table-column prop="processCombination" label="工位组合" width="140" />
|
||||
<el-table-column label="状态" width="90">
|
||||
<template #default="{row}">
|
||||
<el-tag :type="row.status === 'DONE' ? 'success' : 'warning'" size="small">{{ plcStatusText(row.status) }}</el-tag>
|
||||
<el-tag :type="statusTagType(row.status)" size="small">{{ plcStatusText(row.status) }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="ack" label="完成" width="70">
|
||||
@@ -62,9 +63,35 @@
|
||||
<el-table-column prop="sendTime" label="下发时间" width="170" />
|
||||
<el-table-column prop="doneTime" label="完成时间" width="170" />
|
||||
<el-table-column prop="operator" label="操作人" width="90" />
|
||||
<el-table-column prop="remark" label="备注" min-width="140" show-overflow-tooltip />
|
||||
<el-table-column label="操作" width="170" fixed="right">
|
||||
<template #default="{row}">
|
||||
<el-popconfirm v-if="row.status === 'SENT'" title="确认人工完成?仅限现场确认工件实际已到位时使用" @confirm="doManualDone(row)">
|
||||
<template #reference>
|
||||
<el-button link type="success" size="small">人工完成</el-button>
|
||||
</template>
|
||||
</el-popconfirm>
|
||||
<el-button v-if="row.status === 'SENT'" link type="danger" size="small" @click="openWithdraw(row)">撤回</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
|
||||
<!-- 撤回弹窗:原因必填(留痕) -->
|
||||
<el-dialog v-model="withdrawVisible" title="撤回工位下发" width="440px">
|
||||
<el-alert type="warning" :closable="false" style="margin-bottom:12px"
|
||||
title="撤回后该条指令作废(状态=已撤回),可立即重新下发正确工位码;仅「已下发」状态可撤回,全程留痕操作日志。" />
|
||||
<div v-if="withdrawRow" style="margin-bottom:12px;color:#606266;font-size:13px">
|
||||
记录 #{{ withdrawRow.id }} | 工件 {{ withdrawRow.sn }} → 工位 {{ withdrawRow.stationNo }} | 工单 {{ withdrawRow.orderNo }}
|
||||
</div>
|
||||
<el-input v-model="withdrawReason" type="textarea" :rows="3" maxlength="200" show-word-limit
|
||||
placeholder="撤回原因必填,写清楚为什么撤(如:选错工件 SN / 工位带错)" />
|
||||
<template #footer>
|
||||
<el-button @click="withdrawVisible = false">取消</el-button>
|
||||
<el-button type="danger" :disabled="!withdrawReason.trim()" @click="doWithdraw">确认撤回</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</el-card>
|
||||
<PageHelp :data="helpPlc" page="PlcSend" />
|
||||
</template>
|
||||
@@ -80,6 +107,7 @@ import { helpPlc } from '../help'
|
||||
// 多 Tab 范式:下发录入在前默认打开,下发记录在后点击才加载。
|
||||
// 当前工位语义(2026-09-08):选择工件 SN 后由工件实际进度自动带出(只读);
|
||||
// 工位组合由工单「工艺组合」按工位号升序自动派生,不再手选。
|
||||
// 2026-11-03 断头路补全:下发记录支持「撤回」(误下发收回)与「人工完成」(PLC 信号丢失现场收口)。
|
||||
const tab = ref('send')
|
||||
const send = reactive({ orderNo: '', sn: '', stationNo: 0 })
|
||||
const query = reactive({ orderNo: '', status: '' })
|
||||
@@ -89,8 +117,14 @@ const orderSns = ref([])
|
||||
const currentStation = ref(0)
|
||||
const woSearching = ref(false)
|
||||
const snSearching = ref(false)
|
||||
const withdrawVisible = ref(false)
|
||||
const withdrawRow = ref(null)
|
||||
const withdrawReason = ref('')
|
||||
|
||||
const plcStatusText = (s) => (s === 'DONE' ? '已完成' : '已下发')
|
||||
const plcStatusText = (s) => ({
|
||||
SENT: '已下发', DONE: '已完成', CANCELLED: '已撤回', TIMEOUT: '已超时', REPLY_NG: '回复异常'
|
||||
}[s] || s)
|
||||
const statusTagType = (s) => (s === 'DONE' ? 'success' : s === 'CANCELLED' ? 'info' : 'warning')
|
||||
|
||||
// 工单下拉远程搜索(keyword+limit=50,防数据炸弹)
|
||||
async function searchWorkOrders(kw) {
|
||||
@@ -148,6 +182,26 @@ async function doSend() {
|
||||
async function loadLogs() {
|
||||
logs.value = (await request.get('/plc/send-logs', { params: query })) || []
|
||||
}
|
||||
function openWithdraw(row) {
|
||||
withdrawRow.value = row
|
||||
withdrawReason.value = ''
|
||||
withdrawVisible.value = true
|
||||
}
|
||||
async function doWithdraw() {
|
||||
try {
|
||||
await request.post('/plc/send-withdraw', { id: withdrawRow.value.id, reason: withdrawReason.value.trim() })
|
||||
ElMessage.success('已撤回,可重新下发')
|
||||
withdrawVisible.value = false
|
||||
loadLogs()
|
||||
} catch (e) { /* 拦截器已提示 */ }
|
||||
}
|
||||
async function doManualDone(row) {
|
||||
try {
|
||||
await request.post('/plc/send-manual-done', { id: row.id })
|
||||
ElMessage.success('已人工完成,可下发下一条')
|
||||
loadLogs()
|
||||
} catch (e) { /* 拦截器已提示 */ }
|
||||
}
|
||||
function onTab(name) {
|
||||
// 每次切回日志页都重新拉取(2026-10-19:原逻辑仅首次为空时加载,新下发记录切回不刷新)
|
||||
if (name === 'logs') loadLogs()
|
||||
|
||||
@@ -68,7 +68,7 @@
|
||||
<el-tag v-else size="small" type="success">正常</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="200" align="center" fixed="right">
|
||||
<el-table-column label="操作" width="170" align="center" fixed="right">
|
||||
<template #default="{row}">
|
||||
<el-button v-if="can('produce.product:edit')" link type="primary" size="small" @click="openEdit(row)">编辑</el-button>
|
||||
<el-button link type="primary" size="small" @click="openAttach(row)">附件</el-button>
|
||||
|
||||
@@ -1,88 +1,82 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-row :gutter="12">
|
||||
<el-col :xs="24" :md="14">
|
||||
<el-card shadow="never" header="可配置项(保存即生效,无需重启)">
|
||||
<el-form label-width="190px" v-loading="loading" style="max-width:640px">
|
||||
<el-form-item label="WMS 地址(IP:端口)">
|
||||
<div style="display:flex;gap:8px;width:100%">
|
||||
<el-input v-model="form.wmsBaseURL" placeholder="如 http://192.168.1.100:9091,留空=用 YAML 配置/默认" clearable />
|
||||
<el-button :loading="testing" @click="testWms">测试连通</el-button>
|
||||
</div>
|
||||
<div class="tip">保存后立即热切换,所有库存查询/扣账/台账同步即刻走新地址;测试结果:{{ testMsg || '—' }}</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="需求窗口天数">
|
||||
<el-input-number v-model="form.demandDays" :min="1" :max="60" />
|
||||
<div class="tip">缺料补货 / 未来需求按日排产取未来 N 天(默认 5),WMS 备料四态「预警」数据源</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="外推均值窗口(天)">
|
||||
<el-input-number v-model="form.extrapWindow" :min="1" :max="30" />
|
||||
<div class="tip">排产支撑:排产日耗尽仍有余量时,按近 N 天平均日需求外推(默认 3)</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="外推封顶(天)">
|
||||
<el-input-number v-model="form.extrapCap" :min="30" :max="3650" />
|
||||
<div class="tip">排产支撑外推最多算多少天,防死循环(默认 365)</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="事件日志保留天数">
|
||||
<el-input-number v-model="form.logRetentionDays" :min="0" :max="3650" />
|
||||
<div class="tip">超过保留期的操作日志每小时自动清理;0 = 不清理</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="滚筒线缓存模式">
|
||||
<el-input-number v-model="form.pipelineCache" :min="0" :max="1" />
|
||||
<div class="tip">滚筒线缓存模式(1=启用缓存位并行流转,0=串行不缓存);预留配置,PLC 真机接入后生效</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="允许叫非今日排产的料">
|
||||
<el-input-number v-model="form.allowCrossDay" :min="0" :max="1" />
|
||||
<div class="tip">1=允许(默认,叫料池含非今日排产时工位端预警提示,仓库可正常发也可按「非当日」驳回);0=禁止</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="允许跨工位借料">
|
||||
<el-input-number v-model="form.allowBorrow" :min="0" :max="1" />
|
||||
<div class="tip">1=允许(默认):工位自身额度不足时,可手动从「同工艺其他工位」的剩余额度借料;0=禁止,超额叫料直接拒绝</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="拧紧不合格报警">
|
||||
<el-switch v-model="form.torqueNgAlert" />
|
||||
<div class="tip">开启(默认)后,拧紧扭矩不合格立即在预警中心产生报警;关闭则只记录不合格标记、不弹报警</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="看板刷新间隔(秒)">
|
||||
<el-input-number v-model="form.dashboardRefreshSeconds" :min="1" :max="10" />
|
||||
<div class="tip">看板大屏轮询兜底刷新间隔(1~10 秒,默认 5);SSE 实时通道可用时由事件驱动刷新,本值仅作兜底间隔</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="门口看板标题">
|
||||
<el-input v-model="form.dashboardTitle" clearable maxlength="30"
|
||||
placeholder="留空=默认标题(总装产线实时看板)" />
|
||||
<div class="tip">厂门口看板顶部标题文字(留空=保持默认「总装产线实时看板」);看板端每分钟自动拉取跟随</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="门口看板语音播报">
|
||||
<el-switch v-model="form.dashboardVoice" />
|
||||
<div class="tip">开启(默认)后厂门口看板对新报警进行中文语音播报;关闭则只静默展示</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="数据归档提醒周期(天)">
|
||||
<el-input-number v-model="form.archiveRemindDays" :min="0" :max="365" />
|
||||
<div class="tip">距上次成功备份超过该天数时,登录后弹出强提醒(每天一次,仅提醒不自动删除);0 = 关闭</div>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button v-if="can('sys.settings:edit')" type="primary" :loading="saving" @click="save">保存</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :xs="24" :md="10">
|
||||
<el-card shadow="never" header="本机基础信息(只读)">
|
||||
<el-descriptions :column="1" border size="small" v-loading="loading">
|
||||
<el-descriptions-item label="主机名 / 内网IP">
|
||||
<div v-for="ip in info.localIPs || []" :key="ip" style="font-family:monospace">{{ ip }}</div>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="服务监听地址">{{ info.listenAddr || '-' }}</el-descriptions-item>
|
||||
<el-descriptions-item label="数据库">{{ info.dbInfo || '-' }}</el-descriptions-item>
|
||||
<el-descriptions-item label="当前生效 WMS 地址">{{ info.effectiveWms || '-' }}</el-descriptions-item>
|
||||
<el-descriptions-item label="Go 版本">{{ info.goVersion || '-' }}</el-descriptions-item>
|
||||
<el-descriptions-item label="服务启动时间">{{ info.startedAt || '-' }}</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
<el-alert type="info" :closable="false" style="margin-top:12px"
|
||||
title="JWT 密钥、WMS Token、数据库密码等敏感信息不在此页维护,统一留在 etc/bj_power_mes-api.yaml。" />
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-card shadow="never" header="可配置项(保存即生效,无需重启)">
|
||||
<el-form label-width="190px" v-loading="loading" style="max-width:680px">
|
||||
<el-form-item label="需求窗口天数">
|
||||
<el-input-number v-model="form.demandDays" :min="1" :max="60" />
|
||||
<div class="tip">缺料补货 / 未来需求按日排产取未来 N 天(默认 5),WMS 备料四态「预警」数据源</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="外推均值窗口(天)">
|
||||
<el-input-number v-model="form.extrapWindow" :min="1" :max="30" />
|
||||
<div class="tip">排产支撑:排产日耗尽仍有余量时,按近 N 天平均日需求外推(默认 3)</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="外推封顶(天)">
|
||||
<el-input-number v-model="form.extrapCap" :min="30" :max="3650" />
|
||||
<div class="tip">排产支撑外推最多算多少天,防死循环(默认 365)</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="事件日志保留天数">
|
||||
<el-input-number v-model="form.logRetentionDays" :min="0" :max="3650" />
|
||||
<div class="tip">超过保留期的操作日志每小时自动清理;0 = 不清理</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="滚筒线缓存模式">
|
||||
<el-input-number v-model="form.pipelineCache" :min="0" :max="1" />
|
||||
<div class="tip">滚筒线缓存模式(1=启用缓存位并行流转,0=串行不缓存);预留配置,PLC 真机接入后生效</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="允许叫非今日排产的料">
|
||||
<el-input-number v-model="form.allowCrossDay" :min="0" :max="1" />
|
||||
<div class="tip">1=允许(默认,叫料池含非今日排产时工位端预警提示,仓库可正常发也可按「非当日」驳回);0=禁止</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="允许跨工位借料">
|
||||
<el-input-number v-model="form.allowBorrow" :min="0" :max="1" />
|
||||
<div class="tip">1=允许(默认):工位自身额度不足时,可手动从「同工艺其他工位」的剩余额度借料;0=禁止,超额叫料直接拒绝</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="拧紧不合格报警">
|
||||
<el-switch v-model="form.torqueNgAlert" />
|
||||
<div class="tip">开启(默认)后,拧紧扭矩不合格立即在预警中心产生报警;关闭则只记录不合格标记、不弹报警</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="看板刷新间隔(秒)">
|
||||
<el-input-number v-model="form.dashboardRefreshSeconds" :min="1" :max="10" />
|
||||
<div class="tip">看板大屏轮询兜底刷新间隔(1~10 秒,默认 5);SSE 实时通道可用时由事件驱动刷新,本值仅作兜底间隔</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="门口看板标题">
|
||||
<el-input v-model="form.dashboardTitle" clearable maxlength="30"
|
||||
placeholder="留空=默认标题(总装产线实时看板)" />
|
||||
<div class="tip">厂门口看板顶部标题文字(留空=保持默认「总装产线实时看板」);看板端每分钟自动拉取跟随</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="门口看板语音播报">
|
||||
<el-switch v-model="form.dashboardVoice" />
|
||||
<div class="tip">开启(默认)后厂门口看板对新报警进行中文语音播报;关闭则只静默展示</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="数据归档提醒周期(天)">
|
||||
<el-input-number v-model="form.archiveRemindDays" :min="0" :max="365" />
|
||||
<div class="tip">距上次成功备份超过该天数时,登录后弹出强提醒(每天一次,仅提醒不自动删除);0 = 关闭</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="WMS 地址(IP:端口)">
|
||||
<div style="display:flex;gap:8px;width:100%">
|
||||
<el-input v-model="form.wmsBaseURL" placeholder="如 http://192.168.1.100:9091,留空=用 YAML 配置/默认" clearable />
|
||||
<el-button :loading="testing" @click="testWms">测试连通</el-button>
|
||||
</div>
|
||||
<div class="tip">保存后立即热切换,所有库存查询/扣账/台账同步即刻走新地址;测试结果:{{ testMsg || '—' }}</div>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button v-if="can('sys.settings:edit')" type="primary" :loading="saving" @click="save">保存</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</el-card>
|
||||
<el-card shadow="never" header="本机基础信息(只读)" style="margin-top:12px">
|
||||
<el-descriptions :column="1" border size="small" v-loading="loading">
|
||||
<el-descriptions-item label="主机名 / 内网IP">
|
||||
<div v-for="ip in info.localIPs || []" :key="ip" style="font-family:monospace">{{ ip }}</div>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="服务监听地址">{{ info.listenAddr || '-' }}</el-descriptions-item>
|
||||
<el-descriptions-item label="数据库">{{ info.dbInfo || '-' }}</el-descriptions-item>
|
||||
<el-descriptions-item label="当前生效 WMS 地址">{{ info.effectiveWms || '-' }}</el-descriptions-item>
|
||||
<el-descriptions-item label="Go 版本">{{ info.goVersion || '-' }}</el-descriptions-item>
|
||||
<el-descriptions-item label="服务启动时间">{{ info.startedAt || '-' }}</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
<el-alert type="info" :closable="false" style="margin-top:12px"
|
||||
title="JWT 密钥、WMS Token、数据库密码等敏感信息不在此页维护,统一留在 etc/bj_power_mes-api.yaml。" />
|
||||
</el-card>
|
||||
<PageHelp :data="helpSettings" page="Settings" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -94,9 +94,9 @@
|
||||
<span v-else style="color:#909399">全部显示</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="230" align="center" fixed="right">
|
||||
<el-table-column label="操作" width="168" align="center" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<div style="display:flex;align-items:center;justify-content:center;gap:8px;flex-wrap:wrap">
|
||||
<div style="display:flex;align-items:center;justify-content:center;gap:4px;flex-wrap:nowrap">
|
||||
<el-button v-if="can('produce.station:edit') && !row.isBuiltin && row.stationType !== 'OFFLINE'" link type="primary" size="small" @click="openName(row)">编辑</el-button>
|
||||
<el-button link type="primary" size="small" @click="openTabs(row)">页签</el-button>
|
||||
<el-button v-if="can('produce.station:edit')" link size="small" :type="row.status === 'ENABLED' ? 'warning' : 'success'" @click="toggleStationStatus(row)">{{ row.status === 'ENABLED' ? '停用' : '启用' }}</el-button>
|
||||
@@ -121,13 +121,15 @@
|
||||
<el-input v-model="dlg.name" placeholder="如 一号装配工位" />
|
||||
</el-form-item>
|
||||
<el-form-item label="工位类型">
|
||||
<el-select v-if="!dlg.isBuiltin" v-model="dlg.stationType" style="width:100%">
|
||||
<el-select v-if="!dlg.isBuiltin && !dlg.isAdd" v-model="dlg.stationType" style="width:100%">
|
||||
<el-option value="OFFLINE" label="线下位(虚拟,不连 PLC,仅记录)" />
|
||||
<el-option value="LINE" label="线上位(连 PLC)" />
|
||||
</el-select>
|
||||
<span v-else>{{ dlg.stationType === 'OFFLINE' ? '线下位(虚拟,不连 PLC)' : '线上位(连 PLC)' }}</span>
|
||||
<span v-else>线下位(虚拟,不连 PLC,仅记录)</span>
|
||||
<div style="color:#909399;font-size:12px;line-height:1.5;margin-top:4px">
|
||||
{{ dlg.isBuiltin ? '内置工位类型由产线初始配置固定,不可修改。' : '非内置工位可调整类型(看板按「线下位」统计虚拟工位)。' }}
|
||||
<template v-if="dlg.isAdd">新增工位均为虚拟工位(线下位),不连 PLC、仅记录上下线,类型不可选。</template>
|
||||
<template v-else-if="dlg.isBuiltin">内置工位类型由产线初始配置固定,不可修改。</template>
|
||||
<template v-else>非内置工位可调整类型(看板按「线下位」统计虚拟工位)。</template>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
@@ -301,7 +303,7 @@ async function save() {
|
||||
return ElMessage.warning(`工位${dlg.stationNo} 已存在,请换一个工位号`)
|
||||
}
|
||||
await request.post('/stations', {
|
||||
id: dlg.id, stationNo: dlg.stationNo, name: dlg.name, stationType: dlg.stationType
|
||||
id: dlg.id, stationNo: dlg.stationNo, name: dlg.name, stationType: dlg.isAdd ? 'OFFLINE' : dlg.stationType
|
||||
})
|
||||
ElMessage.success(dlg.isAdd ? '工位已新增' : '已保存')
|
||||
dlg.show = false
|
||||
|
||||
Reference in New Issue
Block a user