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
+30 -4
View File
@@ -49,12 +49,19 @@
<el-input v-model="form.displayAgeBuckets" clearable placeholder="如 30,90,180(默认)" />
<div class="tip">逗号分隔的 3 个升序天数,对应大屏库龄柱状图四档:0-a / a-b / b-c / c 以上;改后即时生效</div>
</el-form-item>
<el-form-item label="MES 服务地址">
<div style="display:flex;gap:8px;width:100%">
<el-input v-model="form.mesBaseURL" clearable placeholder="http://127.0.0.1:8888(留空=用配置文件默认)" style="flex:1" />
<el-button :loading="pinging" @click="testMes">测试连接</el-button>
</div>
<div class="tip">MES 后端地址(含端口,如 http://192.168.1.50:8888)。保存即生效、无需重启;留空则回退配置文件默认地址</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-card shadow="never" header="本机基础信息(只读)" style="margin-top:12px">
<el-descriptions :column="2" border size="small" v-loading="loadingInfo">
<el-descriptions-item label="操作系统">{{ info.os || '-' }}</el-descriptions-item>
<el-descriptions-item label="主机名">{{ info.hostname || '-' }}</el-descriptions-item>
@@ -62,9 +69,9 @@
<el-descriptions-item label="监听端口">{{ info.port || '-' }}</el-descriptions-item>
<el-descriptions-item label="启动时间">{{ info.startTime ? fmtTime(info.startTime) : '-' }}</el-descriptions-item>
<el-descriptions-item label="运行时长">{{ uptimeText }}</el-descriptions-item>
<el-descriptions-item label="MES 地址" :span="2">
<el-descriptions-item label="当前生效 MES 地址" :span="2">
{{ info.mesAddress || '-' }}
<span class="tip" style="margin-left:8px">只读;修改需编辑配置文件并重启服务</span>
<span class="tip" style="margin-left:8px">在上方「MES 服务地址」修改,保存即生效</span>
</el-descriptions-item>
</el-descriptions>
</el-card>
@@ -90,7 +97,8 @@ const form = reactive({
displayStockCorner: '库房监控',
displayStockRefresh: 5,
displayCallsRefresh: 10,
displayAgeBuckets: '30,90,180'
displayAgeBuckets: '30,90,180',
mesBaseURL: ''
})
async function load() {
@@ -107,6 +115,7 @@ async function load() {
form.displayStockRefresh = d.displayStockRefresh ?? 5
form.displayCallsRefresh = d.displayCallsRefresh ?? 10
form.displayAgeBuckets = d.displayAgeBuckets || '30,90,180'
form.mesBaseURL = d.mesBaseURL || ''
} catch { /* 默认值兜底 */ }
finally { loading.value = false }
}
@@ -116,9 +125,26 @@ async function save() {
try {
await request.put('/settings', { ...form })
ElMessage.success('已保存并生效')
loadInfo()
} finally { saving.value = false }
}
// MES 连通性测试(用当前输入值先落库再测,避免"测试的是旧地址")
const pinging = ref(false)
async function testMes() {
pinging.value = true
try {
await request.put('/settings', { ...form })
await request.get('/system/mes-ping')
ElMessage.success('MES 连接正常')
} catch {
// 拦截器已提示失败原因
} finally {
pinging.value = false
loadInfo()
}
}
onMounted(load)
// 本机只读信息