feat: 会话令牌与守卫、看板组件及工位终端功能完善
- 用户表扩展:MES/WMS user 实体新增字段,新增 active_token 迁移 SQL(2026-11-11) - 会话机制:MES 新增 session_guard,重构 token/auth/jwt/perm 与路由;WMS/工作站同步令牌续签与鉴权 - 看板(board):调整 MES 看板产线/生产/侧栏/仓库组件及样式;WMS 看板展示页同步调整 - 工位终端后端:完善报警流、绑定、PLC 对账、拧紧、proxy、上报、站点告警/操作等 handler,补充 mes client/store - 工位终端前端:登录/主界面/各操作面板调整,新增滚动分页与多语言 yaml 文案,刷新构建产物 - MES 业务:新增流程链 logic,调整待审核/产能支撑/产品工艺/设置页、PLC 监控与帮助文档,刷新构建产物 - 更新问题记录文档
This commit is contained in:
@@ -474,9 +474,8 @@ onBeforeUnmount(() => {
|
||||
<section class="panel feed-panel" style="flex: 1;">
|
||||
<div class="panel-title">备料叫料池</div>
|
||||
<div class="panel-body call-body">
|
||||
<!-- 上区「待出库」:置顶静态列表,不做无缝滚动,超出时自身滚动 -->
|
||||
<div class="call-zone">
|
||||
<div class="call-zone-title">待出库({{ pendingCalls.length }})</div>
|
||||
<!-- 上区「待出库」:置顶静态列表,不做无缝滚动,超出时自身滚动(无数据时整个区域消失) -->
|
||||
<div v-if="pendingCalls.length" class="call-zone">
|
||||
<div class="call-static">
|
||||
<div v-if="pendingCalls.length" class="call-list">
|
||||
<div v-for="(c, i) in pendingCalls" :key="'p-' + i" class="feed-row call-row">
|
||||
@@ -487,14 +486,12 @@ onBeforeUnmount(() => {
|
||||
<span class="feed-tag call-badge" :class="CALL_BADGE[c.statusKey] || 'badge-shipping'">{{ c.status }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div v-else class="empty">{{ callsOk ? '暂无待出库叫料' : '叫料服务未连接(MES 未启动)' }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- 下区「已送达」:沿用无缝滚动,复制两份列表 -->
|
||||
<div class="call-zone call-zone-done">
|
||||
<div class="call-zone-title">已送达({{ doneCalls.length }})</div>
|
||||
<!-- 下区「已送达」:沿用无缝滚动,复制两份列表(无数据时整个区域消失) -->
|
||||
<div v-if="doneCalls.length" class="call-zone call-zone-done">
|
||||
<div class="feed-viewport">
|
||||
<div v-if="doneCalls.length" class="feed-track" :class="{ rolling: doneCallsLoop }" :style="doneCallsLoop ? { animationDuration: doneCallsDuration } : {}">
|
||||
<div class="feed-track" :class="{ rolling: doneCallsLoop }" :style="doneCallsLoop ? { animationDuration: doneCallsDuration } : {}">
|
||||
<template v-for="copy in (doneCallsLoop ? 2 : 1)" :key="copy">
|
||||
<div v-for="(c, i) in doneCalls" :key="copy + '-' + i" class="feed-row call-row">
|
||||
<span class="feed-time">{{ c.time || '--:--' }}</span>
|
||||
@@ -505,9 +502,10 @@ onBeforeUnmount(() => {
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
<div v-else class="empty">{{ callsOk ? '暂无已送达叫料' : '叫料服务未连接(MES 未启动)' }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- 兜底:仅在服务未连接且两区均无数据时提示(状态提示,非图例) -->
|
||||
<div v-if="!callsOk && !pendingCalls.length && !doneCalls.length" class="empty">叫料服务未连接(MES 未启动)</div>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
@@ -684,14 +682,15 @@ onBeforeUnmount(() => {
|
||||
.badge-shipping { color: #eaf4ff; background: #2f6fe4; }
|
||||
.badge-done { color: #cfe6ff; background: #44598a; }
|
||||
|
||||
.call-body { display: flex; flex-direction: column; gap: clamp(8px, 1vh, 16px); }
|
||||
.call-zone { display: flex; flex-direction: column; min-height: 0; flex: 1; }
|
||||
.call-zone-title {
|
||||
flex-shrink: 0; font-size: clamp(14px, 0.9vw, 20px); letter-spacing: 2px;
|
||||
color: #9cc7ff; padding: 2px 0 6px;
|
||||
}
|
||||
/* 上区置顶:静态列表、不做无缝滚动,超出时自身滚动 */
|
||||
.call-static { flex: 1; min-height: 0; overflow-y: auto; position: relative; padding: 2px 0; }
|
||||
.call-body { display: flex; flex-direction: column; gap: clamp(4px, 0.5vh, 10px); }
|
||||
/* 2026-11-11 修复:待出库 grow=1 会把 1~2 行数据强行撑满上半区(行贴顶、下方大片空白),
|
||||
挤压已送达区只剩单行。改为 grow=0:按内容高度撑开、溢出时自身收缩并内部滚动;
|
||||
已送达 grow=1 占满全部剩余高度,保证多行无缝滚动空间 */
|
||||
.call-zone { display: flex; flex-direction: column; min-height: 0; flex: 0 1 auto; }
|
||||
.call-zone-done { flex: 1 1 0; }
|
||||
/* 隐藏滚动条(Firefox + WebKit),滑动无感衔接 */
|
||||
.call-static { flex: 1; min-height: 0; overflow-y: auto; position: relative; padding: 2px 0; scrollbar-width: none; }
|
||||
.call-static::-webkit-scrollbar { display: none; width: 0; }
|
||||
.call-list { display: flex; flex-direction: column; }
|
||||
/* 下区沿用 .feed-track.rolling + feedScroll 无缝滚动 */
|
||||
.call-zone-done .feed-viewport { flex: 1; min-height: 0; position: relative; }
|
||||
|
||||
@@ -6,11 +6,30 @@ import { showValidationErrors } from './verror'
|
||||
// 统一请求实例:baseURL /api,响应为 { code, message, data }
|
||||
const request = axios.create({ baseURL: '/api', timeout: 30000 })
|
||||
|
||||
// 业务化报错:把底层网络/连接/服务不可达等技术错误翻译成业务人员能看懂的提示
|
||||
// 业务化报错:把底层网络/连接/服务不可达等技术错误翻译成业务人员能看懂的提示。
|
||||
// 2026-11-11:报错必须说清「什么服务不可达、哪个地址」——从后端原始报错里提取服务名与地址拼回提示
|
||||
// (后端原始报错形如:无法连接 MES(http://192.168.1.10:8888):dial tcp ...;MES 未配置;MES 不可达: dial tcp ...)。
|
||||
function pickService(raw) {
|
||||
const m = raw.match(/MES|WMS|RCS|AGV/i)
|
||||
return m ? m[0].toUpperCase() : ''
|
||||
}
|
||||
function pickAddr(raw) {
|
||||
const m = raw.match(/https?:\/\/[^\s'"))),,]+|(?:\d{1,3}\.){3}\d{1,3}(?::\d+)?|\[[0-9a-fA-F:]+\]:\d+/)
|
||||
return m ? m[0].replace(/[.、]+$/, '') : ''
|
||||
}
|
||||
function friendlyMsg(raw) {
|
||||
if (!raw || typeof raw !== 'string') return '操作失败,请稍后重试'
|
||||
if (/dial tcp|connectex|connection could be made|refused|ECONNREFUSED|ETIMEDOUT|127\.0\.0\.1|Post "http|Get "http|WMS 未配置|拉取 WMS|无法获取 WMS|MES 未配置|拉取 MES/i.test(raw)) {
|
||||
return '无法连接服务(服务未启动或网络不可达),相关功能暂不可用;请检查服务状态或联系管理员'
|
||||
// 服务地址未配置(配置缺失 ≠ 连不上,提示去配置而不是查网络)
|
||||
if (/^(MES|WMS|RCS)\s*(客户端)?\s*未配置/i.test(raw.trim()) || /服务地址未配置/i.test(raw)) {
|
||||
const svc = pickService(raw) || '服务'
|
||||
return `${svc} 服务地址未配置,相关功能暂不可用;请到「系统设置」配置${svc}服务地址后重试,或联系管理员`
|
||||
}
|
||||
if (/dial tcp|connectex|connection could be made|refused|ECONNREFUSED|ETIMEDOUT|127\.0\.0\.1|Post "http|Get "http|WMS 未配置|拉取 WMS|无法获取 WMS|MES 未配置|拉取 MES|无法连接|不可达/i.test(raw)) {
|
||||
const svc = pickService(raw)
|
||||
const addr = pickAddr(raw)
|
||||
const who = svc ? ` ${svc} 服务` : ''
|
||||
const where = addr ? `(地址 ${addr})` : ''
|
||||
return `无法连接${who}${where}:服务未启动或网络不可达,相关功能暂不可用;请检查该服务状态或联系管理员`
|
||||
}
|
||||
if (/Network Error|Failed to fetch|ERR_NETWORK|ERR_CONNECTION|网络异常|网络连接/i.test(raw)) {
|
||||
return '网络连接异常,请检查网络后重试或联系管理员'
|
||||
@@ -62,6 +81,17 @@ request.interceptors.response.use(
|
||||
},
|
||||
(error) => {
|
||||
if (error.response?.status === 401) {
|
||||
// 同账号互踢(2026-11-11):后端 401 且 message 带「账号已在其他地方登录」→ 明确提示被踢下线
|
||||
const raw = error.response?.data?.message || ''
|
||||
if (raw.includes('账号已在其他地方登录')) {
|
||||
localStorage.removeItem('token')
|
||||
localStorage.removeItem('user')
|
||||
ElMessage.error('账号已在其他地方登录,本会话已下线,请重新登录')
|
||||
if (!window.location.pathname.startsWith('/login')) {
|
||||
window.location.href = '/login'
|
||||
}
|
||||
return Promise.reject(error)
|
||||
}
|
||||
localStorage.removeItem('token')
|
||||
localStorage.removeItem('user')
|
||||
ElMessage.error('登录已失效,请重新登录')
|
||||
|
||||
Reference in New Issue
Block a user