diff --git a/apps/l2/src/api/l2/sendJob.js b/apps/l2/src/api/l2/sendJob.js index 22ce6a7..2377169 100644 --- a/apps/l2/src/api/l2/sendJob.js +++ b/apps/l2/src/api/l2/sendJob.js @@ -1,4 +1,4 @@ -import request from '@/utils/L2Request' +import request from '@/utils/request' // 创建发送任务 export function createSendJob(data) { diff --git a/apps/l2/src/api/l2/sendTemplate.js b/apps/l2/src/api/l2/sendTemplate.js index b152e4d..6975389 100644 --- a/apps/l2/src/api/l2/sendTemplate.js +++ b/apps/l2/src/api/l2/sendTemplate.js @@ -1,4 +1,4 @@ -import request from '@/utils/L2Request' +import request from '@/utils/request' // 获取发送模板(含明细) export function getSendTemplate(templateCode) { diff --git a/apps/l2/src/api/l2/setupValue.js b/apps/l2/src/api/l2/setupValue.js index 82eabc3..dd27f1e 100644 --- a/apps/l2/src/api/l2/setupValue.js +++ b/apps/l2/src/api/l2/setupValue.js @@ -1,4 +1,4 @@ -import request from '@/utils/L2Request' +import request from '@/utils/request' // 获取 DRIVE 设定值(最新成功发送) export function getDriveSetupValue() { diff --git a/apps/l2/src/api/l2/template.js b/apps/l2/src/api/l2/template.js index d1d319e..af6a2fb 100644 --- a/apps/l2/src/api/l2/template.js +++ b/apps/l2/src/api/l2/template.js @@ -1,4 +1,4 @@ -import request from '@/utils/l2-request' +import request from '@/utils/request' /** * 按模板编码查询发送模板(含明细) diff --git a/apps/l2/src/views/l2/send/furnace.vue b/apps/l2/src/views/l2/send/furnace.vue index 31e0714..ab89b40 100644 --- a/apps/l2/src/views/l2/send/furnace.vue +++ b/apps/l2/src/views/l2/send/furnace.vue @@ -7,57 +7,26 @@ - + - + 保存模板 - + 应用上次成功参数 - + 历史记录 - + @@ -71,13 +40,7 @@ 上次下发:{{ formatTime(lastSuccess.lastSendTime) }} - + 下发 @@ -86,11 +49,7 @@
-
+
{{ group.groupTitle }} ({{ group.items.length }} 项) @@ -98,17 +57,10 @@ - + - +
@@ -176,8 +128,17 @@ export default { computed: { templateItems() { if (!this.template || !Array.isArray(this.template.items)) return [] + // 后端 enabled 可能是 1/0、"1"/"0"、true/false,避免被错误过滤导致页面无字段 return [...this.template.items] - .filter(i => i.enabled === undefined || i.enabled === 1) + .filter(i => { + const en = i && i.enabled + // 未提供 enabled:默认展示 + if (en === undefined || en === null || en === '') return true + // 明确禁用:0/"0"/false + if (en === 0 || en === false) return false + if (String(en) === '0') return false + return true + }) .sort((a, b) => (a.itemNo || 0) - (b.itemNo || 0)) }, @@ -427,7 +388,7 @@ export default { type: 'warning' }).then(() => { this.doSend() - }).catch(() => {}) + }).catch(() => { }) }, async doSend() { @@ -499,23 +460,88 @@ export default {