diff --git a/ui/dasadmin/src/views/backend/malfunction/index.vue b/ui/dasadmin/src/views/backend/malfunction/index.vue index 7593f6d6..2cf6c3d5 100644 --- a/ui/dasadmin/src/views/backend/malfunction/index.vue +++ b/ui/dasadmin/src/views/backend/malfunction/index.vue @@ -399,9 +399,12 @@ const configFormData = reactive({ validStartLine: 4, }) const defaultConfigData = { - timeFormat: 'yyyy-MM-dd-HH:mm:ss.SSS', - delimiter: ';', - validStartLine: 4, + plcTimeFormat: 'dd.MM.yyyy HH:mm:ss,SSS', + plcDelimiter: '\t', + plcValidStartLine: 12, + fdrTimeFormat: 'yyyy-MM-dd_HH-mm-ss.SSS', + fdrDelimiter: ';', + fdrValidStartLine: 7, } const setConfigType = ref<'malFunction' | 'logManage'>('malFunction') @@ -409,13 +412,13 @@ const openConfigDialog = (type: 'malFunction' | 'logManage') => { configDialogVisible.value = true setConfigType.value = type if (type === 'malFunction') { - configFormData.delimiter = rightClickData.value.options?.fdrFormat?.delimiter ?? defaultConfigData.delimiter - configFormData.timeFormat = rightClickData.value.options?.fdrFormat?.timeFormat ?? defaultConfigData.timeFormat - configFormData.validStartLine = rightClickData.value.options?.fdrFormat?.validStartLine ?? defaultConfigData.validStartLine + configFormData.delimiter = rightClickData.value.options?.fdrFormat?.delimiter ?? defaultConfigData.fdrDelimiter + configFormData.timeFormat = rightClickData.value.options?.fdrFormat?.timeFormat ?? defaultConfigData.fdrTimeFormat + configFormData.validStartLine = rightClickData.value.options?.fdrFormat?.validStartLine ?? defaultConfigData.fdrValidStartLine } else if (type === 'logManage') { - configFormData.delimiter = rightClickData.value.options?.plcFormat?.delimiter ?? defaultConfigData.delimiter - configFormData.timeFormat = rightClickData.value.options?.plcFormat?.timeFormat ?? defaultConfigData.timeFormat - configFormData.validStartLine = rightClickData.value.options?.plcFormat?.validStartLine ?? defaultConfigData.validStartLine + configFormData.delimiter = rightClickData.value.options?.plcFormat?.delimiter ?? defaultConfigData.plcDelimiter + configFormData.timeFormat = rightClickData.value.options?.plcFormat?.timeFormat ?? defaultConfigData.plcTimeFormat + configFormData.validStartLine = rightClickData.value.options?.plcFormat?.validStartLine ?? defaultConfigData.plcValidStartLine } } @@ -521,7 +524,7 @@ const readFile = (data: tableItemData) => { }) } else { data.push({ - label: fileKeyEnums[item], + label: fileKeyEnums?.[item] ?? item, key: item, isLeaf: true, }) @@ -643,7 +646,7 @@ const createSeriresData = () => { seriesData.push(seriesItem) } else { const color = getRandomDarkColor() - const createName = fileKeyEnums[item] + (fileKeyUnit[item] ? `(${fileKeyUnit[item] ?? ''})` : '') + const createName = fileKeyEnums?.[item] ? fileKeyEnums[item] + (fileKeyUnit[item] ? `(${fileKeyUnit[item] ?? ''})` : '') : item const data = { id: item,