From 8463c89276f7ea3ad11e5e629d8e3897dd6a93f5 Mon Sep 17 00:00:00 2001 From: 86156 <823267011@qq.com> Date: Wed, 31 Dec 2025 18:02:35 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BC=A0=E5=8A=A8?= =?UTF-8?q?=E3=80=81=E7=82=89=E7=81=AB=E5=86=99=E5=85=A5=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/l2/sendJob.js | 36 ++++ src/api/l2/sendTemplate.js | 19 ++ src/api/l2/template.js | 13 ++ src/views/l2/send/drive.vue | 321 ++++++++++++++++++++++++++++++++++ src/views/l2/send/furnace.vue | 285 ++++++++++++++++++++++++++++++ src/views/l2/setup/index.vue | 14 +- 6 files changed, 681 insertions(+), 7 deletions(-) create mode 100644 src/api/l2/sendJob.js create mode 100644 src/api/l2/sendTemplate.js create mode 100644 src/api/l2/template.js create mode 100644 src/views/l2/send/drive.vue create mode 100644 src/views/l2/send/furnace.vue diff --git a/src/api/l2/sendJob.js b/src/api/l2/sendJob.js new file mode 100644 index 0000000..45d33a8 --- /dev/null +++ b/src/api/l2/sendJob.js @@ -0,0 +1,36 @@ +import request from '@/utils/l2-request' + +// 创建发送任务 +export function createSendJob(data) { + return request({ + url: '/business/sendJob', + method: 'post', + data: data + }) +} + +// 执行发送任务 +export function executeSendJob(jobId) { + return request({ + url: `/business/sendJob/${jobId}/execute`, + method: 'post' + }) +} + +// 查询发送任务列表(用于历史追溯,此页面暂不使用) +export function listSendJob(query) { + return request({ + url: '/business/sendJob/list', + method: 'get', + params: query + }) +} + +// 获取发送任务详情(用于历史追溯,此页面暂不使用) +export function getSendJob(jobId) { + return request({ + url: `/business/sendJob/${jobId}`, + method: 'get' + }) +} + diff --git a/src/api/l2/sendTemplate.js b/src/api/l2/sendTemplate.js new file mode 100644 index 0000000..cbd2495 --- /dev/null +++ b/src/api/l2/sendTemplate.js @@ -0,0 +1,19 @@ +import request from '@/utils/L2Request' + +// 获取发送模板(含明细) +export function getSendTemplate(templateCode) { + return request({ + url: `/business/sendTemplate/${templateCode}`, + method: 'get' + }) +} + +// 获取最近一次成功发送(用于推荐值 + 上次发送时间显示) +export function getLastSuccess(groupType) { + return request({ + url: '/business/sendJob/lastSuccess', + method: 'get', + params: { groupType } + }) +} + diff --git a/src/api/l2/template.js b/src/api/l2/template.js new file mode 100644 index 0000000..d1d319e --- /dev/null +++ b/src/api/l2/template.js @@ -0,0 +1,13 @@ +import request from '@/utils/l2-request' + +/** + * 按模板编码查询发送模板(含明细) + * @param {string} templateCode 模板编码,如 FURNACE_DEFAULT + */ +export function getSendTemplate(templateCode) { + return request({ + url: `/business/sendTemplate/${templateCode}`, + method: 'get' + }) +} + diff --git a/src/views/l2/send/drive.vue b/src/views/l2/send/drive.vue new file mode 100644 index 0000000..df8a7b8 --- /dev/null +++ b/src/views/l2/send/drive.vue @@ -0,0 +1,321 @@ + + + + + diff --git a/src/views/l2/send/furnace.vue b/src/views/l2/send/furnace.vue new file mode 100644 index 0000000..336c35e --- /dev/null +++ b/src/views/l2/send/furnace.vue @@ -0,0 +1,285 @@ + + + + + diff --git a/src/views/l2/setup/index.vue b/src/views/l2/setup/index.vue index b845441..8f15781 100644 --- a/src/views/l2/setup/index.vue +++ b/src/views/l2/setup/index.vue @@ -45,7 +45,7 @@ - +
@@ -124,7 +124,7 @@ export default { padding: 15px; background: #e8e8e8; border-bottom: 1px solid #d4d4d4; - + h3 { margin: 0; font-size: 16px; @@ -137,23 +137,23 @@ export default { border-right: none; flex: 1; overflow: hidden; - + ::v-deep .el-menu-item { height: 48px; line-height: 48px; font-size: 13px; color: #666; - + &.is-active { background-color: #f0f0f0; color: #333; border-right: 2px solid #999; } - + &:hover { background-color: #f5f5f5; } - + i { margin-right: 8px; font-size: 14px; @@ -177,4 +177,4 @@ export default { display: flex; flex-direction: column; } - \ No newline at end of file + From 1718116e1e734349854072a0feea47f7f8e15528 Mon Sep 17 00:00:00 2001 From: 86156 <823267011@qq.com> Date: Wed, 31 Dec 2025 18:11:34 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BC=A0=E5=8A=A8?= =?UTF-8?q?=E3=80=81=E7=82=89=E7=81=AB=E5=86=99=E5=85=A5=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/l2/sendTemplate.js | 17 +++ src/views/l2/send/furnace.vue | 278 ++++++++++++++++++++++------------ 2 files changed, 195 insertions(+), 100 deletions(-) diff --git a/src/api/l2/sendTemplate.js b/src/api/l2/sendTemplate.js index cbd2495..d34bc82 100644 --- a/src/api/l2/sendTemplate.js +++ b/src/api/l2/sendTemplate.js @@ -17,3 +17,20 @@ export function getLastSuccess(groupType) { }) } +// 更新模板主表(deviceName 等) +export function updateSendTemplate(data) { + return request({ + url: '/business/sendTemplate', + method: 'put', + data + }) +} + +// 批量更新模板明细(address/defaultValueRaw/enabled 等) +export function updateSendTemplateItems(data) { + return request({ + url: '/business/sendTemplate/items', + method: 'put', + data + }) +} diff --git a/src/views/l2/send/furnace.vue b/src/views/l2/send/furnace.vue index 336c35e..862a44c 100644 --- a/src/views/l2/send/furnace.vue +++ b/src/views/l2/send/furnace.vue @@ -8,10 +8,31 @@ Refresh - + + + + Save Template + + + - + + + + + + +
+ Address: + +
@@ -62,158 +95,195 @@
+ + + +
+
{{ editingItem.labelEn }}
+ +
+ + 修改的是模板点位地址,点击 "Save Template" 后同步到数据库。 +
+
+ +
From 9f008b0b96c51395fe297d7471570a8cc94c7325 Mon Sep 17 00:00:00 2001 From: 86156 <823267011@qq.com> Date: Wed, 31 Dec 2025 18:29:12 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/l2/sendJob.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/l2/sendJob.js b/src/api/l2/sendJob.js index 45d33a8..b784e88 100644 --- a/src/api/l2/sendJob.js +++ b/src/api/l2/sendJob.js @@ -1,4 +1,4 @@ -import request from '@/utils/l2-request' +import request from '@/utils/L2Request' // 创建发送任务 export function createSendJob(data) { From 74c5267aeba985a047ffcdff6a98b214aaeb2aef Mon Sep 17 00:00:00 2001 From: 86156 <823267011@qq.com> Date: Wed, 31 Dec 2025 20:05:29 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=86=99=E5=85=A5?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E8=BF=BD=E8=B8=AA=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/l2/sendJob.js | 8 +- src/api/l2/setupValue.js | 20 + src/components/FloatingPanel.vue | 237 + src/views/l2/send/drive.vue | 216 +- src/views/l2/send/furnace.vue | 99 +- src/views/l2/send/history.vue | 141 + .../l2/track/components/LatestSetValues.vue | 114 + src/views/l2/track/rect.vue | 4909 +++++++++-------- 8 files changed, 3108 insertions(+), 2636 deletions(-) create mode 100644 src/api/l2/setupValue.js create mode 100644 src/components/FloatingPanel.vue create mode 100644 src/views/l2/send/history.vue create mode 100644 src/views/l2/track/components/LatestSetValues.vue diff --git a/src/api/l2/sendJob.js b/src/api/l2/sendJob.js index b784e88..22ce6a7 100644 --- a/src/api/l2/sendJob.js +++ b/src/api/l2/sendJob.js @@ -5,7 +5,7 @@ export function createSendJob(data) { return request({ url: '/business/sendJob', method: 'post', - data: data + data }) } @@ -17,8 +17,9 @@ export function executeSendJob(jobId) { }) } -// 查询发送任务列表(用于历史追溯,此页面暂不使用) +// 查询发送任务列表(分页) export function listSendJob(query) { + // 若你后端是 GET /business/sendJob/list(现状),这里用 params return request({ url: '/business/sendJob/list', method: 'get', @@ -26,11 +27,10 @@ export function listSendJob(query) { }) } -// 获取发送任务详情(用于历史追溯,此页面暂不使用) +// 获取发送任务详情 export function getSendJob(jobId) { return request({ url: `/business/sendJob/${jobId}`, method: 'get' }) } - diff --git a/src/api/l2/setupValue.js b/src/api/l2/setupValue.js new file mode 100644 index 0000000..82eabc3 --- /dev/null +++ b/src/api/l2/setupValue.js @@ -0,0 +1,20 @@ +import request from '@/utils/L2Request' + +// 获取 DRIVE 设定值(最新成功发送) +export function getDriveSetupValue() { + return request({ + url: '/business/sendJob/lastSuccess', + method: 'get', + params: { groupType: 'DRIVE' } + }) +} + +// 获取 FURNACE 设定值(最新成功发送) +export function getFurnaceSetupValue() { + return request({ + url: '/business/sendJob/lastSuccess', + method: 'get', + params: { groupType: 'FURNACE' } + }) +} + diff --git a/src/components/FloatingPanel.vue b/src/components/FloatingPanel.vue new file mode 100644 index 0000000..731b6e6 --- /dev/null +++ b/src/components/FloatingPanel.vue @@ -0,0 +1,237 @@ + + + + + + diff --git a/src/views/l2/send/drive.vue b/src/views/l2/send/drive.vue index df8a7b8..501081f 100644 --- a/src/views/l2/send/drive.vue +++ b/src/views/l2/send/drive.vue @@ -1,8 +1,5 @@