From ba7593e8253e4d8100f58e2cbab29433028e6671 Mon Sep 17 00:00:00 2001 From: wangyu <823267011@qq.com> Date: Wed, 13 May 2026 16:43:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Eapp=E5=92=8C=E8=B7=9F?= =?UTF-8?q?=E8=B8=AA=E9=A1=B5=E9=9D=A2=EF=BC=8C=E7=8E=B0=E5=B7=B2=E7=BB=8F?= =?UTF-8?q?=E8=B0=83=E9=80=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/client/SqlServerApiClient.java | 24 + .../service/SqlServerApiBusinessService.java | 28 + .../sqlserver/SqlServerApiController.java | 8 + klp-ui/src/api/l2/timing.js | 8 + .../acid/components/ActualPerformance.vue | 24 +- .../acid/components/QualityReportDialog.vue | 631 ++++++++++++++++++ .../pages/acid/components/TrackingView.vue | 436 ++++++++++++ klp-ui/src/views/micro/pages/acid/index.vue | 16 +- .../views/timing/acid/QualityReportDialog.vue | 623 +++++++++++++++++ klp-ui/src/views/timing/acid/index.vue | 42 ++ 10 files changed, 1838 insertions(+), 2 deletions(-) create mode 100644 klp-ui/src/views/micro/pages/acid/components/QualityReportDialog.vue create mode 100644 klp-ui/src/views/micro/pages/acid/components/TrackingView.vue create mode 100644 klp-ui/src/views/timing/acid/QualityReportDialog.vue diff --git a/klp-admin/src/main/java/com/klp/framework/client/SqlServerApiClient.java b/klp-admin/src/main/java/com/klp/framework/client/SqlServerApiClient.java index 7b990455..1bdfd602 100644 --- a/klp-admin/src/main/java/com/klp/framework/client/SqlServerApiClient.java +++ b/klp-admin/src/main/java/com/klp/framework/client/SqlServerApiClient.java @@ -474,6 +474,30 @@ public class SqlServerApiClient { ); } + public ExecuteSqlResponse queryMatMap() { + return executeSql( + "oracle", + "select AREAID, GROUPID, POS, FULLPLACENAME, CREMATIDTYPE, MATIDTYPE, MATID, SUBPART, UPDMASTER, DISPLAYNAME, L1MAPIDX, UPDTIME from JXPLTCM.ROMTB_MATMAP order by L1MAPIDX", + emptyParams() + ); + } + + public ExecuteSqlResponse queryEntryTrace() { + return executeSql( + "oracle", + "select * from JXPLTCM.V_PLTCM_ENTRY_TRACE order by L1MAPIDX", + emptyParams() + ); + } + + public ExecuteSqlResponse queryExitTrace() { + return executeSql( + "oracle", + "select * from JXPLTCM.V_PLTCM_EXIT_TRACE order by L1MAPIDX", + emptyParams() + ); + } + private org.springframework.util.MultiValueMap convertToQueryParams(Map queryParams) { org.springframework.util.LinkedMultiValueMap multiValueMap = new org.springframework.util.LinkedMultiValueMap<>(); if (queryParams == null || queryParams.isEmpty()) { diff --git a/klp-admin/src/main/java/com/klp/framework/service/SqlServerApiBusinessService.java b/klp-admin/src/main/java/com/klp/framework/service/SqlServerApiBusinessService.java index f5c9544d..416eb7ce 100644 --- a/klp-admin/src/main/java/com/klp/framework/service/SqlServerApiBusinessService.java +++ b/klp-admin/src/main/java/com/klp/framework/service/SqlServerApiBusinessService.java @@ -126,6 +126,34 @@ public class SqlServerApiBusinessService { return client.queryShapeByMatId(matId); } + /** + * 跟踪数据：ROMTB_MATMAP + V_PLTCM_ENTRY_TRACE + V_PLTCM_EXIT_TRACE 一次返回。 + */ + public TrackDataView getTrackData() { + List> matMapRows = asRowList(client.queryMatMap()); + List> entryRows = asRowList(client.queryEntryTrace()); + List> exitRows = asRowList(client.queryExitTrace()); + return new TrackDataView(matMapRows, entryRows, exitRows); + } + + public static class TrackDataView { + private final List> matMap; + private final List> entryTrace; + private final List> exitTrace; + + public TrackDataView(List> matMap, + List> entryTrace, + List> exitTrace) { + this.matMap = matMap; + this.entryTrace = entryTrace; + this.exitTrace = exitTrace; + } + + public List> getMatMap() { return matMap; } + public List> getEntryTrace() { return entryTrace; } + public List> getExitTrace() { return exitTrace; } + } + /** * 出口卷实绩列表（分页），来自 PLTCM_PDO_EXCOIL。 */ diff --git a/klp-admin/src/main/java/com/klp/framework/sqlserver/SqlServerApiController.java b/klp-admin/src/main/java/com/klp/framework/sqlserver/SqlServerApiController.java index fd7e144c..52a2e5e3 100644 --- a/klp-admin/src/main/java/com/klp/framework/sqlserver/SqlServerApiController.java +++ b/klp-admin/src/main/java/com/klp/framework/sqlserver/SqlServerApiController.java @@ -183,6 +183,14 @@ public class SqlServerApiController { return R.ok(businessService.getPresetSetupByCoilId(coilId)); } + /** + * 跟踪数据：matMap + entryTrace + exitTrace 一次返回。 + */ + @GetMapping("/track") + public R trackData() { + return R.ok(businessService.getTrackData()); + } + /** * 换辊历史总条数。 */ diff --git a/klp-ui/src/api/l2/timing.js b/klp-ui/src/api/l2/timing.js index d9f7271e..ef659aec 100644 --- a/klp-ui/src/api/l2/timing.js +++ b/klp-ui/src/api/l2/timing.js @@ -143,6 +143,14 @@ export function getExcoilCount() { }) } +// 跟踪数据：matMap + entryTrace + exitTrace +export function getTrackData() { + return request({ + url: '/sql-server-api/track', + method: 'get' + }) +} + // 工艺预设参数，按计划钢卷号查询，PLTCM_PRESET_SETUP export function getPresetSetupByCoilId(coilId) { return request({ diff --git a/klp-ui/src/views/micro/pages/acid/components/ActualPerformance.vue b/klp-ui/src/views/micro/pages/acid/components/ActualPerformance.vue index 0f4b062e..d67a4ba3 100644 --- a/klp-ui/src/views/micro/pages/acid/components/ActualPerformance.vue +++ b/klp-ui/src/views/micro/pages/acid/components/ActualPerformance.vue @@ -1,4 +1,5 @@ + + +
- +
查找
@@ -194,11 +200,15 @@
+ + + + + diff --git a/klp-ui/src/views/micro/pages/acid/components/TrackingView.vue b/klp-ui/src/views/micro/pages/acid/components/TrackingView.vue new file mode 100644 index 00000000..c908b5e9 --- /dev/null +++ b/klp-ui/src/views/micro/pages/acid/components/TrackingView.vue @@ -0,0 +1,436 @@ + + + + + diff --git a/klp-ui/src/views/micro/pages/acid/index.vue b/klp-ui/src/views/micro/pages/acid/index.vue index c00337ca..36a67e5e 100644 --- a/klp-ui/src/views/micro/pages/acid/index.vue +++ b/klp-ui/src/views/micro/pages/acid/index.vue @@ -46,6 +46,14 @@ 停机 + + + app + + + + 跟踪 +
@@ -65,6 +73,8 @@ import ActualPerformance from './components/ActualPerformance.vue'; import RollConfig from '@/views/timing/roll/index.vue'; import RollHistory from '@/views/timing/roll/history.vue'; import Stoppage from '@/views/timing/stoppage/index.vue'; +import AcidTiming from '@/views/lines/acid/index.vue'; +import TrackingView from './components/TrackingView.vue'; export default { name: 'AcidSystem', @@ -78,7 +88,9 @@ export default { ActualPerformance, RollConfig, RollHistory, - Stoppage + Stoppage, + AcidTiming, + TrackingView }, data() { return { @@ -98,6 +110,8 @@ export default { rollConfig: 'RollConfig', rollHistory: 'RollHistory', stoppage: 'Stoppage', + acidTiming: 'AcidTiming', + tracking: 'TrackingView', }; return componentMap[this.activeMenu]; }, diff --git a/klp-ui/src/views/timing/acid/QualityReportDialog.vue b/klp-ui/src/views/timing/acid/QualityReportDialog.vue new file mode 100644 index 00000000..b8c8a369 --- /dev/null +++ b/klp-ui/src/views/timing/acid/QualityReportDialog.vue @@ -0,0 +1,623 @@ + + + + + diff --git a/klp-ui/src/views/timing/acid/index.vue b/klp-ui/src/views/timing/acid/index.vue index 75eea626..f2601d93 100644 --- a/klp-ui/src/views/timing/acid/index.vue +++ b/klp-ui/src/views/timing/acid/index.vue @@ -1,4 +1,5 @@