diff --git a/ui/dasadmin/src/views/backend/logRecord/index.vue b/ui/dasadmin/src/views/backend/logRecord/index.vue index 5717b186..872c072a 100644 --- a/ui/dasadmin/src/views/backend/logRecord/index.vue +++ b/ui/dasadmin/src/views/backend/logRecord/index.vue @@ -360,7 +360,7 @@ const setAirBlowerConfig = () => { }) .then(() => { nextTick(() => { - treeRef.value?.setCurrentKey(curTreeData.value.id,false) + treeRef.value?.setCurrentKey(curTreeData.value.id, false) curTreeData.value = treeRef.value?.getCurrentNode() }) }) @@ -457,16 +457,14 @@ const getRandomDarkColor = () => { let color = `#${r.toString(16).padStart(2, '0')}${g.toString(16).padStart(2, '0')}${b.toString(16).padStart(2, '0')}` return color } -const createSeriresData = () => { +const createSeriesData = () => { const seriesData: any = [] const curAttr = curSeries.map((item: any) => item.name) - selectPreviewTree.forEach((item: string, index: number) => { - if (curAttr.includes(item)) { - seriesData.push(curSeries[index]) - } - }) selectPreviewTree.forEach((item: string) => { - if (!curAttr.includes(item)) { + if (curAttr.includes(item)) { + const seriesItem = curSeries.find((cur: any) => cur.name === item) + seriesData.push(seriesItem) + } else { const color = getRandomDarkColor() const data = { name: item, @@ -488,7 +486,7 @@ const createSeriresData = () => { } const initPreviewChart = () => { const chart = previewChartInstance ?? echarts.init(previewChartRef.value) - const series = createSeriresData() + const series = createSeriesData() const option = { grid: { top: 50, diff --git a/ui/dasadmin/src/views/backend/malfunction/index.vue b/ui/dasadmin/src/views/backend/malfunction/index.vue index b9bda1fc..cf76e8d6 100644 --- a/ui/dasadmin/src/views/backend/malfunction/index.vue +++ b/ui/dasadmin/src/views/backend/malfunction/index.vue @@ -362,7 +362,7 @@ const setAirBlowerConfig = () => { }) .then(() => { nextTick(() => { - treeRef.value?.setCurrentKey(curTreeData.value.id,false) + treeRef.value?.setCurrentKey(curTreeData.value.id, false) curTreeData.value = treeRef.value?.getCurrentNode() }) }) @@ -439,9 +439,9 @@ const handleCheckChange = (data: any, state: boolean) => { const index = selectPreviewTree.findIndex((item: string) => item === data.key) selectPreviewTree.splice(index, 1) } - if(selectPreviewTree.length > 0){ + if (selectPreviewTree.length > 0) { initPreviewChart() - }else{ + } else { previewChartInstance && previewChartInstance.clear() } } @@ -467,16 +467,12 @@ const getRandomDarkColor = () => { } const createSeriresData = () => { const seriesData: any = [] - console.log(curSeries); - const curAttr = curSeries.map((item: any) => item.name) - selectPreviewTree.forEach((item: string, index: number) => { - if (curAttr.includes(item)) { - seriesData.push(curSeries[index]) - } - }) selectPreviewTree.forEach((item: string) => { - if (!curAttr.includes(item)) { + if (curAttr.includes(item)) { + const seriesItem = curSeries.find((cur: any) => cur.name === item) + seriesData.push(seriesItem) + } else { const color = getRandomDarkColor() const data = { name: item, @@ -628,7 +624,6 @@ onMounted(() => { treeRef.value && treeRef.value.setCurrentKey(data.id, true) curTreeData.value = data getListForAirBlower() - }) })