From bf1c157b131adb6a10fd3723d68b5619d0aa3093 Mon Sep 17 00:00:00 2001 From: huguanghan Date: Fri, 15 Nov 2024 16:58:22 +0800 Subject: [PATCH 1/5] =?UTF-8?q?plc=E6=97=A5=E5=BF=97=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E8=A7=A3=E6=9E=90,=E5=8E=BB=E9=99=A4=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/das/modules/plc/service/impl/PlcLogsServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/das/src/main/java/com/das/modules/plc/service/impl/PlcLogsServiceImpl.java b/das/src/main/java/com/das/modules/plc/service/impl/PlcLogsServiceImpl.java index 24718b4d..8a72156d 100644 --- a/das/src/main/java/com/das/modules/plc/service/impl/PlcLogsServiceImpl.java +++ b/das/src/main/java/com/das/modules/plc/service/impl/PlcLogsServiceImpl.java @@ -128,14 +128,14 @@ public class PlcLogsServiceImpl implements PlcLogService { List timeList = new ArrayList<>(); long timestamp = convertToTimestamp(item.get(i), timeFormat); timeList.add(timestamp); - map.put(listField.get(i),timeList); + map.put(listField.get(i).trim(),timeList); }else if (i == 1 || i == 2){ continue; } else { List valueList = new ArrayList<>(); valueList.add(Double.valueOf(item.get(i))); - map.put(listField.get(i), valueList); + map.put(listField.get(i).trim(), valueList); } } else { From eab0e2fdb237749e2fde54442ccc1edd61e63c08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= Date: Fri, 15 Nov 2024 21:46:50 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=97=A5=E5=BF=97=EF=BC=9A=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=9B=BE=E8=A1=A8=E6=97=B6=E9=97=B4=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/dasadmin/src/views/backend/logRecord/index.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ui/dasadmin/src/views/backend/logRecord/index.vue b/ui/dasadmin/src/views/backend/logRecord/index.vue index 688f059d..42a05151 100644 --- a/ui/dasadmin/src/views/backend/logRecord/index.vue +++ b/ui/dasadmin/src/views/backend/logRecord/index.vue @@ -520,7 +520,7 @@ const initPreviewChart = () => { color: '#999999', }, }, - data: previewChartData['TimeStamp'], + data: previewChartData['TimeStampUTC'], }, yAxis: [ { @@ -584,9 +584,9 @@ const getFileData = (url: string) => { previewChartData = res.data const attrName = Object.keys(res.data) const data: any = [] - attrName.forEach((item) => { - if (item === 'TimeStamp') { - previewChartData.TimeStamp = previewChartData.TimeStamp.map((item: any) => { + attrName.forEach((item) => { + if (item === 'TimeStampUTC') { + previewChartData.TimeStampUTC = previewChartData.TimeStampUTC.map((item: any) => { return dayjs(item).format('YYYY-MM-DD HH:mm:ss') }) } else { @@ -597,6 +597,7 @@ const getFileData = (url: string) => { }) } }) + previewTreeData.value = data originPreviewTreeData = data previewTreeLoading.value = false From 5523d7de0115be87bf18ec013f063e459400c9dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= Date: Sat, 16 Nov 2024 13:27:47 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=97=A5=E5=BF=97=EF=BC=9A=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=85=8D=E7=BD=AE=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/dasadmin/src/views/backend/logRecord/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/dasadmin/src/views/backend/logRecord/index.vue b/ui/dasadmin/src/views/backend/logRecord/index.vue index 42a05151..85863301 100644 --- a/ui/dasadmin/src/views/backend/logRecord/index.vue +++ b/ui/dasadmin/src/views/backend/logRecord/index.vue @@ -211,7 +211,7 @@ const getTreeDataList = () => { label: item.name, code: item.code, id: item.id, - options: item.options ? JSON.parse(item.options).fdrFormat : {}, + options: item.options ? JSON.parse(item.options).plcFormat : {}, } }) originTreeChildData = data @@ -344,7 +344,7 @@ const cancelConfig = () => { } const setAirBlowerConfig = () => { - const stringify = JSON.stringify({ fdrFormat: configFormData }) + const stringify = JSON.stringify({ plcFormat: configFormData }) setConfigReq({ id: curTreeData.value.id, From c2eccb2b74e3dbacddc7f0f80028a468e3d2ec41 Mon Sep 17 00:00:00 2001 From: huguanghan Date: Mon, 18 Nov 2024 09:17:59 +0800 Subject: [PATCH 4/5] =?UTF-8?q?plc=E6=97=A5=E5=BF=97=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E8=A7=A3=E6=9E=90,=E5=8E=BB=E9=99=A4=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/plc/service/impl/PlcLogsServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/das/src/main/java/com/das/modules/plc/service/impl/PlcLogsServiceImpl.java b/das/src/main/java/com/das/modules/plc/service/impl/PlcLogsServiceImpl.java index 8a72156d..7bbf58c1 100644 --- a/das/src/main/java/com/das/modules/plc/service/impl/PlcLogsServiceImpl.java +++ b/das/src/main/java/com/das/modules/plc/service/impl/PlcLogsServiceImpl.java @@ -123,13 +123,14 @@ public class PlcLogsServiceImpl implements PlcLogService { data.remove(0); for (List item : data) { for (int i = 0; i < listField.size(); i++) { - if (map.get(listField.get(i)) == null) { + if (map.get(listField.get(i).trim()) == null) { if (i == 0){ List timeList = new ArrayList<>(); long timestamp = convertToTimestamp(item.get(i), timeFormat); timeList.add(timestamp); map.put(listField.get(i).trim(),timeList); - }else if (i == 1 || i == 2){ + } + else if (i == 1 || i == 2){ continue; } else { @@ -139,10 +140,11 @@ public class PlcLogsServiceImpl implements PlcLogService { } } else { - List valueList = map.get(listField.get(i)); + List valueList = map.get(listField.get(i).trim()); if (i == 0){ valueList.add(convertToTimestamp(item.get(i),timeFormat)); - } else if (i == 1 || i == 2) { + } + else if (i == 1 || i == 2) { continue; } else { valueList.add(Double.valueOf(item.get(i))); From 9e9d4d99218f202269988081527867aae8804073 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= Date: Mon, 18 Nov 2024 09:58:19 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=95=85=E9=9A=9C=E5=BD=95=E6=B3=A2?= =?UTF-8?q?=EF=BC=9A=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=96=B0=E5=90=8E=E5=88=B7?= =?UTF-8?q?=E6=96=B0=E6=A0=91=E7=BB=93=E6=9E=84=20=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=9A=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=90=8E=E5=88=B7=E6=96=B0=E6=A0=91=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/dasadmin/src/views/backend/logRecord/index.vue | 14 ++++++++++++-- .../src/views/backend/malfunction/index.vue | 9 +++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/ui/dasadmin/src/views/backend/logRecord/index.vue b/ui/dasadmin/src/views/backend/logRecord/index.vue index 85863301..5717b186 100644 --- a/ui/dasadmin/src/views/backend/logRecord/index.vue +++ b/ui/dasadmin/src/views/backend/logRecord/index.vue @@ -353,6 +353,16 @@ const setAirBlowerConfig = () => { .then(() => { ElMessage.success('配置成功') configDialogVisible.value = false + return + }) + .then(() => { + return getTreeDataList() + }) + .then(() => { + nextTick(() => { + treeRef.value?.setCurrentKey(curTreeData.value.id,false) + curTreeData.value = treeRef.value?.getCurrentNode() + }) }) .catch((err) => { ElMessage.error('配置失败') @@ -584,7 +594,7 @@ const getFileData = (url: string) => { previewChartData = res.data const attrName = Object.keys(res.data) const data: any = [] - attrName.forEach((item) => { + attrName.forEach((item) => { if (item === 'TimeStampUTC') { previewChartData.TimeStampUTC = previewChartData.TimeStampUTC.map((item: any) => { return dayjs(item).format('YYYY-MM-DD HH:mm:ss') @@ -597,7 +607,7 @@ const getFileData = (url: string) => { }) } }) - + previewTreeData.value = data originPreviewTreeData = data previewTreeLoading.value = false diff --git a/ui/dasadmin/src/views/backend/malfunction/index.vue b/ui/dasadmin/src/views/backend/malfunction/index.vue index ae306ce3..b9bda1fc 100644 --- a/ui/dasadmin/src/views/backend/malfunction/index.vue +++ b/ui/dasadmin/src/views/backend/malfunction/index.vue @@ -357,6 +357,15 @@ const setAirBlowerConfig = () => { ElMessage.success('配置成功') configDialogVisible.value = false }) + .then(() => { + return getTreeDataList() + }) + .then(() => { + nextTick(() => { + treeRef.value?.setCurrentKey(curTreeData.value.id,false) + curTreeData.value = treeRef.value?.getCurrentNode() + }) + }) .catch((err) => { ElMessage.error('配置失败') })