From 5c9a7e32d2eaeac56ca5b77da4b2cc463d3da80f Mon Sep 17 00:00:00 2001 From: SunYF <123@hard_man.com> Date: Tue, 17 Nov 2026 06:41:41 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=9C=8B=E6=9D=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=B1=8F=E4=B8=93=E5=B1=9E=E9=9D=A2=E6=9D=BF=E4=B8=8E=E8=BF=BD?= =?UTF-8?q?=E6=BA=AF=E6=9F=A5=E8=AF=A2=E4=B8=89=E5=90=88=E4=B8=80=20+=20AG?= =?UTF-8?q?V=E7=8A=B6=E6=80=81WS=E5=AE=9E=E6=97=B6=E6=8E=A8=E9=80=81=20+?= =?UTF-8?q?=20=E6=95=B0=E6=8D=AE=E5=BA=93=E9=94=99=E8=AF=AF=E5=8F=8B?= =?UTF-8?q?=E5=A5=BD=E6=96=87=E6=A1=88=E5=88=86=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bj_power_mes/common/httpx/response.go | 81 +++- bj_power_mes/frontend/src/board/BoardApp.vue | 4 + .../frontend/src/board/boardRequest.js | 4 + .../frontend/src/board/boardService.js | 2 + .../src/board/components/BoardKpi.vue | 9 +- .../src/board/components/BoardLineModel.vue | 71 +++- .../src/board/components/BoardManage.vue | 169 ++++++++ .../board/components/BoardMaterialQuery.vue | 178 ++++++--- .../src/board/components/RankBars.vue | 43 +++ bj_power_mes/frontend/src/help.js | 4 +- .../frontend/src/layouts/MainLayout.vue | 7 +- .../frontend/src/pages/AccountManage.vue | 4 +- bj_power_mes/frontend/src/pages/Agv.vue | 159 +++++++- bj_power_mes/frontend/src/pages/Inspect.vue | 10 +- .../frontend/src/pages/LineManagement.vue | 83 +++- .../frontend/src/pages/Performance.vue | 2 +- .../frontend/src/pages/ProductProcess.vue | 2 +- .../frontend/src/pages/ProductType.vue | 22 +- bj_power_mes/frontend/src/pages/Station.vue | 79 +--- .../frontend/src/pages/TransferReturn.vue | 2 +- bj_power_mes/frontend/src/pages/Wip.vue | 2 +- bj_power_mes/frontend/src/pages/WorkOrder.vue | 25 +- .../internal/handler/production/production.go | 81 +++- .../internal/handler/routes_production.go | 14 + bj_power_mes/internal/logic/dashboard.go | 3 +- .../internal/logic/dashboard_front.go | 105 +++-- .../internal/logic/dashboard_manage.go | 363 ++++++++++++++++++ .../internal/logic/dashboard_types.go | 184 ++++++--- bj_power_mes/internal/logic/inspection.go | 10 +- bj_power_mes/internal/logic/processflow.go | 27 ++ bj_power_mes/internal/logic/product_import.go | 36 +- bj_power_mes/internal/logic/workpiece.go | 76 +++- bj_power_mes/internal/plc/route.go | 6 +- bj_power_mes/internal/wmsclient/client.go | 15 +- bj_power_mes/internal/ws/agv_hub.go | 15 +- bj_power_mes/public/index.html | 4 +- .../frontend/src/components/VChart.vue | 4 + bj_power_wms/frontend/src/pages/CallQueue.vue | 2 +- bj_power_wms/frontend/src/pages/Display.vue | 152 +++++++- .../frontend/src/pages/Inspection.vue | 231 +++++++---- bj_power_wms/frontend/src/pages/Inventory.vue | 7 +- .../frontend/src/pages/PalletWorkbench.vue | 2 +- .../frontend/src/pages/PreparationList.vue | 2 +- .../frontend/src/pages/ReturnOrder.vue | 2 +- .../frontend/src/pages/UserManage.vue | 2 +- bj_power_wms/internal/handler/internalapi.go | 145 +++++-- bj_power_wms/web/static/index.html | 2 +- .../frontend/src/api/index.js | 3 + .../frontend/src/views/Login.vue | 2 +- .../src/views/panels/InspectPanel.vue | 2 +- .../src/views/panels/MaterialPanel.vue | 4 +- .../src/views/panels/OfflinePanel.vue | 2 +- .../frontend/src/views/panels/OnlinePanel.vue | 351 ++++++----------- .../frontend/src/views/panels/WorkPanel.vue | 92 ++--- .../src/views/panels/WorkloadDialog.vue | 2 +- .../internal/handler/routes.go | 1 + .../internal/handler/workpiece.go | 32 ++ bj_power_workstation/web/static/index.html | 2 +- 问题临时.md | 146 ++++++- 59 files changed, 2302 insertions(+), 789 deletions(-) create mode 100644 bj_power_mes/frontend/src/board/components/BoardManage.vue create mode 100644 bj_power_mes/frontend/src/board/components/RankBars.vue create mode 100644 bj_power_mes/internal/logic/dashboard_manage.go diff --git a/bj_power_mes/common/httpx/response.go b/bj_power_mes/common/httpx/response.go index 3a28304..144b8e9 100644 --- a/bj_power_mes/common/httpx/response.go +++ b/bj_power_mes/common/httpx/response.go @@ -33,41 +33,80 @@ func OkMessage(w http.ResponseWriter, message string, data any) { writeJSON(w, http.StatusOK, Resp{Code: 0, Message: message, Data: data}) } -// friendlyMessage 把数据库唯一约束冲突(SQLSTATE 23505)等技术错误转成业务语言提示。 +// friendlyMessage 把数据库底层技术错误(pq: / SQLSTATE / 约束冲突等)统一转成用户能看懂的业务提示。 // 覆盖所有出口(Fail / FailHTTP / FailErr / BadRequest / InternalError), -// 免得某个 handler 直接 err.Error() 就把 "重复键违反唯一约束..." 原样弹给用户。 +// 免得某个 handler 直接 err.Error() 就把 "duplicate key violates unique constraint..." 原样弹给用户。 +// 分层:①已知唯一约束(23505)按表名给精确对象名 → ②其他已知 SQLSTATE 按类型给友好文案 → +// ③未识别的 pq:/SQLSTATE 兜底给通用提示(附原始错误便于排查)→ ④纯业务文本原样返回(不误伤)。 func friendlyMessage(raw string) string { if raw == "" { return raw } lower := strings.ToLower(raw) + + // ① 唯一约束冲突(23505):按约束/表名给更具体的业务对象名 isDup := strings.Contains(lower, "23505") || strings.Contains(lower, "duplicate key") || strings.Contains(lower, "violates unique constraint") || strings.Contains(lower, "重复键") || strings.Contains(lower, "重复键违反唯一约束") - if !isDup { - return raw + if isDup { + switch { + case strings.Contains(lower, "sys_config"): + return "该配置项已存在,请勿重复添加(同名模板/配置只能保存一次)" + case strings.Contains(lower, "station"): + return "该工位已存在,请勿重复添加(工位号不能重复)" + case strings.Contains(lower, "work_order") || strings.Contains(lower, "workorder"): + return "该产品工号已存在,请勿重复添加" + case strings.Contains(lower, "workpiece") || strings.Contains(lower, "_sn"): + return "该产品序号(SN)已存在,请勿重复添加" + case strings.Contains(lower, "material") || strings.Contains(lower, "product_type"): + return "该物料已存在,请勿重复添加(图号不能重复)" + case strings.Contains(lower, "daily_plan"): + return "该工单在这天已有排产,请勿重复添加" + case strings.Contains(lower, "user") || strings.Contains(lower, "username"): + return "该账号已存在,请勿重复添加" + default: + return "该记录已存在,请勿重复添加(同名或同编号的记录只能保存一次)" + } } - // 按约束/表名给更具体的业务对象名;命中不了走通用提示 + + // ② 其他已知 SQLSTATE / 约束类型,按错误性质给友好提示 + 怎么办 switch { - case strings.Contains(lower, "sys_config"): - return "该配置项已存在,请勿重复添加(同名模板/配置只能保存一次)" - case strings.Contains(lower, "station"): - return "该工位已存在,请勿重复添加(工位号不能重复)" - case strings.Contains(lower, "work_order") || strings.Contains(lower, "workorder"): - return "该产品工号已存在,请勿重复添加" - case strings.Contains(lower, "workpiece") || strings.Contains(lower, "_sn"): - return "该产品序号(SN)已存在,请勿重复添加" - case strings.Contains(lower, "material") || strings.Contains(lower, "product_type"): - return "该物料已存在,请勿重复添加(图号不能重复)" - case strings.Contains(lower, "daily_plan"): - return "该工单在这天已有排产,请勿重复添加" - case strings.Contains(lower, "user") || strings.Contains(lower, "username"): - return "该账号已存在,请勿重复添加" - default: - return "该记录已存在,请勿重复添加(同名或同编号的记录只能保存一次)" + case strings.Contains(lower, "23503") || strings.Contains(lower, "violates foreign key constraint"): + return "保存失败:该记录已被其他单据引用,不能删除或改为无效值。请先处理引用它的单据再重试" + case strings.Contains(lower, "23502") || strings.Contains(lower, "violates not-null constraint") || strings.Contains(lower, "null value in column"): + return "保存失败:有必填内容未填。请检查带星号的必填项后重试" + case strings.Contains(lower, "22001") || strings.Contains(lower, "value too long") || strings.Contains(lower, "character varying"): + return "保存失败:某项内容超过允许长度。请缩短名称/备注后重试" + case strings.Contains(lower, "22003") || strings.Contains(lower, "numeric value out of range"): + return "保存失败:某项数字超出允许范围。请核对数量/数值后重试" + case strings.Contains(lower, "22p02") || strings.Contains(lower, "invalid input syntax") || strings.Contains(lower, "invalid input syntax for type"): + return "保存失败:某项数字或日期格式不正确。请检查录入内容后重试" + case strings.Contains(lower, "23514") || strings.Contains(lower, "violates check constraint"): + return "保存失败:某项内容不符合业务规则取值。请核对选项后重试" + case strings.Contains(lower, "40001") || strings.Contains(lower, "deadlock detected"): + return "保存失败:本次操作与其他操作冲突。请稍等片刻后重试" + case strings.Contains(lower, "42p01") || strings.Contains(lower, "relation") && strings.Contains(lower, "does not exist"): + return "保存失败:相关数据未就绪(表或结构不存在)。请通知维护人员初始化数据后再试" + case strings.Contains(lower, "42703") || strings.Contains(lower, "column") && strings.Contains(lower, "does not exist"): + return "保存失败:数据结构与程序版本不一致。请通知维护人员升级后再试" + case strings.Contains(lower, "08006") || strings.Contains(lower, "connection") && strings.Contains(lower, "refused") || strings.Contains(lower, "could not connect"): + return "保存失败:数据库连接不可用。请检查网络/数据库服务后重试" } + + // ③ 未归类的底层数据库错误(pq:/SQLSTATE/ent 约束):兜底友好提示,附原始错误供定位,避免吞掉线索 + isDB := strings.Contains(lower, "pq:") || + strings.Contains(lower, "sqlstate") || + strings.Contains(lower, "ent: constraint failed") || + strings.Contains(lower, "constraint failed") || + strings.Contains(lower, "constraint violation") + if isDB { + return "保存失败:数据校验未通过或数据库处理异常,请核对录入内容后重试;若反复出现请把提示原文反馈维护人员(" + raw + ")" + } + + // ④ 纯业务文本:原样返回,不误伤 + return raw } // Fail 业务失败(HTTP 200,业务码非0) diff --git a/bj_power_mes/frontend/src/board/BoardApp.vue b/bj_power_mes/frontend/src/board/BoardApp.vue index 1a30d97..b7cb9f5 100644 --- a/bj_power_mes/frontend/src/board/BoardApp.vue +++ b/bj_power_mes/frontend/src/board/BoardApp.vue @@ -20,6 +20,9 @@ 【{{ a.level || '告警' }}】{{ a.target }}:{{ a.message }} + + +
数据加载中…
@@ -55,6 +58,7 @@ import BoardProduction from './components/BoardProduction.vue' import BoardWarehouse from './components/BoardWarehouse.vue' import BoardSide from './components/BoardSide.vue' import BoardMaterialQuery from './components/BoardMaterialQuery.vue' +import BoardManage from './components/BoardManage.vue' /** * 门口看板 /board(由 App.tsx 迁移):100 寸 · 无鼠标 · 纯流式自适应。 diff --git a/bj_power_mes/frontend/src/board/boardRequest.js b/bj_power_mes/frontend/src/board/boardRequest.js index 3e6f938..8228a07 100644 --- a/bj_power_mes/frontend/src/board/boardRequest.js +++ b/bj_power_mes/frontend/src/board/boardRequest.js @@ -24,6 +24,10 @@ export const boardEndpoints = { snapshot: 'dashboard/snapshot', config: 'dashboard/config', materialQuery: 'dashboard/material-query', + /** 管理屏专属查询(客户 22 条) */ + tempo: 'dashboard/tempo', + contractQuery: 'dashboard/contract-query', + batchTrace: 'dashboard/batch-trace', /** SSE 必须走 fetch 流,用同源完整路径 */ stream: '/api/internal/dashboard/stream', } diff --git a/bj_power_mes/frontend/src/board/boardService.js b/bj_power_mes/frontend/src/board/boardService.js index 44ab597..ba20753 100644 --- a/bj_power_mes/frontend/src/board/boardService.js +++ b/bj_power_mes/frontend/src/board/boardService.js @@ -313,6 +313,8 @@ function normalize(raw) { agv: raw.agv ?? [], events: raw.events ?? [], alarms: raw.alarms ?? [], + // 客户 22 条:管理屏专属聚合(停机TOP/不良TOP/返修报废/节拍/缺料/低库存) + manage: raw.manage ?? {}, isDemo: false, } } diff --git a/bj_power_mes/frontend/src/board/components/BoardKpi.vue b/bj_power_mes/frontend/src/board/components/BoardKpi.vue index 970e65e..4b2bb77 100644 --- a/bj_power_mes/frontend/src/board/components/BoardKpi.vue +++ b/bj_power_mes/frontend/src/board/components/BoardKpi.vue @@ -27,7 +27,6 @@ const allCells = computed(() => { const output = p.outputToday ?? 0 const target = p.targetToday ?? 0 const pct = target > 0 ? Math.min(100, Math.round((output / target) * 100)) : null - const locPct = w.locationTotal > 0 ? Math.round((w.locationUsed / w.locationTotal) * 100) : null return [ { key: 'output', label: '今日产量', value: output, unit: '件', sub: target > 0 ? `目标 ${target} 件` : '目标未下达', color: '#22d3ee' }, { key: 'rate', label: '产量达成', value: pct === null ? '—' : pct, unit: pct === null ? '' : '%', sub: '实际 / 目标', color: '#34d399' }, @@ -47,13 +46,7 @@ const allCells = computed(() => { sub: '扫码枪 + 拧紧枪', color: '#22d3ee', }, - { - key: 'location', label: '库位利用率', - value: locPct === null ? '—' : locPct, - unit: locPct === null ? '' : '%', - sub: w.locationTotal > 0 ? `已用 ${w.locationUsed} / 共 ${w.locationTotal}` : '库位未维护', - color: '#a78bfa', - }, + // 客户诉求3:顶部「库位利用率」已删除(与仓储概览 BoardWarehouse 重复),仅保留底部仓储概览那一份。 // 2026-11-10 新增可选指标:在「基础设置 → 看板顶部指标」里勾选后才显示 { key: 'yield', label: '良率', value: Number(p.qualifiedRate ?? 0).toFixed(1), unit: '%', sub: '全工序一次合格 / 总完工', color: '#34d399' }, { diff --git a/bj_power_mes/frontend/src/board/components/BoardLineModel.vue b/bj_power_mes/frontend/src/board/components/BoardLineModel.vue index 1e50103..15690c5 100644 --- a/bj_power_mes/frontend/src/board/components/BoardLineModel.vue +++ b/bj_power_mes/frontend/src/board/components/BoardLineModel.vue @@ -59,7 +59,10 @@ {{ s.end ? `工位${s.no} 下料` : `工位${s.no}` }} - + + + {{ s.tagLabel }} + @@ -67,7 +70,8 @@ {{ s.currentProcess || '待排产' }} {{ s.currentSn || '无在制工件' }} - {{ s.currentOperator || '未登录' }}{{ s.doneCount ? ` · 完成 ${s.doneCount}` : '' }} + + {{ s.currentOperator || '未登录' }}{{ s.planCount > 0 ? ` · ${s.doneCount}/${s.planCount} (${s.doneRate}%)` : (s.doneCount ? ` · 完成 ${s.doneCount}` : '') }} @@ -89,12 +93,14 @@ - - + + + {{ a.label }} + {{ a.label }} · {{ a.statusLabel }} - AGV 搬运通道 · 任务驱动 + AGV 搬运通道 · {{ agvLegend }} @@ -297,6 +303,16 @@ const stationBoxes = computed(() => PAIR_STOP.flatMap(([up, down, stop]) => { const st = byNo.value.get(no) const running = st?.status === 'running' const offline = st?.status === 'offline' + // 客户诉求11:状态标签映射(后端 stationTag: normal/shortage/offline) + const tag = st?.stationTag || (offline ? 'offline' : st?.paused ? 'shortage' : 'normal') + const tagMap = { + shortage: { fill: '#ef4444', blink: true, label: '缺料/离开' }, + offline: { fill: '#94a3b8', blink: false, label: '离线' }, + normal: { fill: running ? '#67e8f9' : '#60a5fa', blink: running, label: '正常' }, + } + const tagStyle = tagMap[tag] || tagMap.normal + const planCount = Number(st?.planCount || 0) + const doneCount = Number(st?.doneCount || 0) return { no, x: center, @@ -304,13 +320,18 @@ const stationBoxes = computed(() => PAIR_STOP.flatMap(([up, down, stop]) => { running, offline, paused: !!st?.paused, - fill: offline ? 'rgba(51,65,85,0.5)' : running ? 'rgba(8,145,178,0.38)' : 'rgba(30,64,175,0.38)', - edge: offline ? '#475569' : running ? '#22d3ee' : '#3b82f6', + tagFill: tagStyle.fill, + tagBlink: tagStyle.blink, + tagLabel: tagStyle.label, + fill: tag === 'shortage' ? 'rgba(127,29,29,0.5)' : offline ? 'rgba(51,65,85,0.5)' : running ? 'rgba(8,145,178,0.38)' : 'rgba(30,64,175,0.38)', + edge: tag === 'shortage' ? '#ef4444' : offline ? '#475569' : running ? '#22d3ee' : '#3b82f6', end: no >= 11, currentProcess: st?.currentProcess, currentSn: st?.currentSn, currentOperator: st?.currentOperator, - doneCount: st?.doneCount, + doneCount, + planCount, + doneRate: planCount > 0 ? Math.min(100, Math.round(doneCount / planCount * 100)) : 0, } }) })) @@ -325,6 +346,15 @@ const dockBoxes = computed(() => PAIR_STOP.filter(([up]) => up < 11).flatMap(([u ] })) +// 客户诉求12:AGV 状态 → 车体/指示灯颜色映射(与 Agv.vue 细化口径一致) +const AGV_COLOR = { + 空闲: { body: '#4ade80', lamp: '#22c55e', blink: false }, + 运送中: { body: '#fb923c', lamp: '#fde047', blink: true }, + 装货中: { body: '#22d3ee', lamp: '#67e8f9', blink: true }, + 故障: { body: '#ef4444', lamp: '#fca5a5', blink: true }, + 充电: { body: '#60a5fa', lamp: '#93c5fd', blink: false }, + 待命: { body: '#94a3b8', lamp: '#cbd5e1', blink: false }, +} const agvCars = computed(() => { const list = props.data.agv || [] return [ @@ -339,9 +369,20 @@ const agvCars = computed(() => { else if (robot.status === 'loading' || robot.status === 'waiting') pos = from else pos = to ?? from } - return { pos, label: (robot?.code ?? 'AGV').replace('AGV-', 'AGV ') } + const statusLabel = robot?.statusLabel || '待命' + const c = AGV_COLOR[statusLabel] || AGV_COLOR['待命'] + return { + pos, label: (robot?.code ?? 'AGV').replace('AGV-', 'AGV '), + statusLabel, bodyColor: c.body, lampColor: c.lamp, lampBlink: c.blink, + } }) }) +const agvLegend = computed(() => { + const list = props.data.agv || [] + if (!list.length) return '任务驱动' + const labels = [...new Set(list.map((a) => a.statusLabel || '待命'))] + return labels.join(' / ') +}) const legends = [ { y: 0, color: COLOR.stopOn, label: '停靠位(到位即进工位)' }, @@ -367,3 +408,15 @@ const virtualRows = computed(() => [0, 1].flatMap((copy) => virtuals.value.map(( } }))) + + diff --git a/bj_power_mes/frontend/src/board/components/BoardManage.vue b/bj_power_mes/frontend/src/board/components/BoardManage.vue new file mode 100644 index 0000000..6e290ed --- /dev/null +++ b/bj_power_mes/frontend/src/board/components/BoardManage.vue @@ -0,0 +1,169 @@ + + + + + diff --git a/bj_power_mes/frontend/src/board/components/BoardMaterialQuery.vue b/bj_power_mes/frontend/src/board/components/BoardMaterialQuery.vue index 4e11ba4..d3cf6c5 100644 --- a/bj_power_mes/frontend/src/board/components/BoardMaterialQuery.vue +++ b/bj_power_mes/frontend/src/board/components/BoardMaterialQuery.vue @@ -1,43 +1,87 @@