sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.jsspisoft.com/ry-das

Browse Source
This commit is contained in:
谷成伟 2024-11-18 10:27:47 +08:00
commit 290e521e83
3 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
das/src/main/java/com/das/modules/plc/service/impl/PlcLogsServiceImpl.java
View File

@ -123,26 +123,28 @@ public class PlcLogsServiceImpl implements PlcLogService {
data.remove(0); data.remove(0);
for (List<String> item : data) { for (List<String> item : data) {
for (int i = 0; i < listField.size(); i++) { 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){ if (i == 0){
List<Object> timeList = new ArrayList<>(); List<Object> timeList = new ArrayList<>();
long timestamp = convertToTimestamp(item.get(i), timeFormat); long timestamp = convertToTimestamp(item.get(i), timeFormat);
timeList.add(timestamp); timeList.add(timestamp);
map.put(listField.get(i),timeList); map.put(listField.get(i).trim(),timeList);
}else if (i == 1 || i == 2){ }
else if (i == 1 || i == 2){
continue; continue;
} }
else { else {
List<Object> valueList = new ArrayList<>(); List<Object> valueList = new ArrayList<>();
valueList.add(Double.valueOf(item.get(i))); valueList.add(Double.valueOf(item.get(i)));
map.put(listField.get(i), valueList); map.put(listField.get(i).trim(), valueList);
} }
} else { } else {
List<Object> valueList = map.get(listField.get(i)); List<Object> valueList = map.get(listField.get(i).trim());
if (i == 0){ if (i == 0){
valueList.add(convertToTimestamp(item.get(i),timeFormat)); valueList.add(convertToTimestamp(item.get(i),timeFormat));
} else if (i == 1 || i == 2) { }
else if (i == 1 || i == 2) {
continue; continue;
} else { } else {
valueList.add(Double.valueOf(item.get(i))); valueList.add(Double.valueOf(item.get(i)));

21
ui/dasadmin/src/views/backend/logRecord/index.vue
View File

@ -211,7 +211,7 @@ const getTreeDataList = () => {
label: item.name, label: item.name,
code: item.code, code: item.code,
id: item.id, id: item.id,
options: item.options ? JSON.parse(item.options).fdrFormat : {}, options: item.options ? JSON.parse(item.options).plcFormat : {},
} }
}) })
originTreeChildData = data originTreeChildData = data
@ -344,7 +344,7 @@ const cancelConfig = () => {
} }
const setAirBlowerConfig = () => { const setAirBlowerConfig = () => {
const stringify = JSON.stringify({ fdrFormat: configFormData }) const stringify = JSON.stringify({ plcFormat: configFormData })
setConfigReq({ setConfigReq({
id: curTreeData.value.id, id: curTreeData.value.id,
@ -353,6 +353,16 @@ const setAirBlowerConfig = () => {
.then(() => { .then(() => {
ElMessage.success('配置成功') ElMessage.success('配置成功')
configDialogVisible.value = false configDialogVisible.value = false
return
})
.then(() => {
return getTreeDataList()
})
.then(() => {
nextTick(() => {
treeRef.value?.setCurrentKey(curTreeData.value.id,false)
curTreeData.value = treeRef.value?.getCurrentNode()
})
}) })
.catch((err) => { .catch((err) => {
ElMessage.error('配置失败') ElMessage.error('配置失败')
@ -520,7 +530,7 @@ const initPreviewChart = () => {
color: '#999999', color: '#999999',
}, },
}, },
data: previewChartData['TimeStamp'], data: previewChartData['TimeStampUTC'],
}, },
yAxis: [ yAxis: [
{ {
@ -585,8 +595,8 @@ const getFileData = (url: string) => {
const attrName = Object.keys(res.data) const attrName = Object.keys(res.data)
const data: any = [] const data: any = []
attrName.forEach((item) => { attrName.forEach((item) => {
if (item === 'TimeStamp') { if (item === 'TimeStampUTC') {
previewChartData.TimeStamp = previewChartData.TimeStamp.map((item: any) => { previewChartData.TimeStampUTC = previewChartData.TimeStampUTC.map((item: any) => {
return dayjs(item).format('YYYY-MM-DD HH:mm:ss') return dayjs(item).format('YYYY-MM-DD HH:mm:ss')
}) })
} else { } else {
@ -597,6 +607,7 @@ const getFileData = (url: string) => {
}) })
} }
}) })
previewTreeData.value = data previewTreeData.value = data
originPreviewTreeData = data originPreviewTreeData = data
previewTreeLoading.value = false previewTreeLoading.value = false

9
ui/dasadmin/src/views/backend/malfunction/index.vue
View File

@ -357,6 +357,15 @@ const setAirBlowerConfig = () => {
ElMessage.success('配置成功') ElMessage.success('配置成功')
configDialogVisible.value = false configDialogVisible.value = false
}) })
.then(() => {
return getTreeDataList()
})
.then(() => {
nextTick(() => {
treeRef.value?.setCurrentKey(curTreeData.value.id,false)
curTreeData.value = treeRef.value?.getCurrentNode()
})
})
.catch((err) => { .catch((err) => {
ElMessage.error('配置失败') ElMessage.error('配置失败')
}) })