Commit 09977928e49730f06f5456e860f460e71ee2fc9b
1 parent
700fc7be
fix: DEFECT-679 chart render problem
Showing
2 changed files
with
4 additions
and
2 deletions
| ... | ... | @@ -136,6 +136,7 @@ |
| 136 | 136 | const hasDetailPermission = hasPermission('api:yt:dataBoard:detail'); |
| 137 | 137 | if (hasDetailPermission) |
| 138 | 138 | router.push(`/data/board/detail/${encode(record.id)}/${encode(record.name)}`); |
| 139 | + else createMessage.warning('没有权限'); | |
| 139 | 140 | }; |
| 140 | 141 | |
| 141 | 142 | const handlePagenationPosition = () => { | ... | ... |
| ... | ... | @@ -112,7 +112,7 @@ |
| 112 | 112 | const wrapRef = ref<HTMLDivElement | null>(null); |
| 113 | 113 | const chartRef = ref<HTMLDivElement | null>(null); |
| 114 | 114 | const deviceAttrs = ref<string[]>([]); |
| 115 | - const { setOptions, getInstance } = useECharts(chartRef as Ref<HTMLDivElement>); | |
| 115 | + const { setOptions, getInstance, resize } = useECharts(chartRef as Ref<HTMLDivElement>); | |
| 116 | 116 | const isNull = ref(true); |
| 117 | 117 | const { toPromise } = useScript({ src: BAI_DU_MAP_URL }); |
| 118 | 118 | const [registerDetailDrawer, { openDrawer }] = useDrawer(); |
| ... | ... | @@ -254,6 +254,7 @@ |
| 254 | 254 | // 发送请求 |
| 255 | 255 | loading.value = true; |
| 256 | 256 | const res = await getDeviceHistoryInfo(searchParams); |
| 257 | + loading.value = false; | |
| 257 | 258 | // 判断数据对象是否为空 |
| 258 | 259 | if (!Object.keys(res).length) { |
| 259 | 260 | isNull.value = false; |
| ... | ... | @@ -262,7 +263,6 @@ |
| 262 | 263 | isNull.value = true; |
| 263 | 264 | } |
| 264 | 265 | setChartOptions(res, value.keys); |
| 265 | - loading.value = false; | |
| 266 | 266 | }, |
| 267 | 267 | }); |
| 268 | 268 | |
| ... | ... | @@ -356,6 +356,7 @@ |
| 356 | 356 | data: dataArray.filter((item1) => item1[2] === item), |
| 357 | 357 | }; |
| 358 | 358 | }); |
| 359 | + resize(); | |
| 359 | 360 | // 设置数据 |
| 360 | 361 | setOptions(eChartOptions(series, keys)); |
| 361 | 362 | } | ... | ... |