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..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,26 +123,28 @@ 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),timeList); - }else if (i == 1 || i == 2){ + 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 { - 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))); diff --git a/ui/dasadmin/src/views/backend/logRecord/index.vue b/ui/dasadmin/src/views/backend/logRecord/index.vue index 688f059d..5717b186 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, @@ -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('配置失败') @@ -520,7 +530,7 @@ const initPreviewChart = () => { color: '#999999', }, }, - data: previewChartData['TimeStamp'], + data: previewChartData['TimeStampUTC'], }, yAxis: [ { @@ -585,8 +595,8 @@ const getFileData = (url: string) => { const attrName = Object.keys(res.data) const data: any = [] attrName.forEach((item) => { - if (item === 'TimeStamp') { - previewChartData.TimeStamp = previewChartData.TimeStamp.map((item: any) => { + if (item === 'TimeStampUTC') { + previewChartData.TimeStampUTC = previewChartData.TimeStampUTC.map((item: any) => { return dayjs(item).format('YYYY-MM-DD HH:mm:ss') }) } else { @@ -597,6 +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('配置失败') })