Commit 700fc7be099c862e5cbe6496771b0476045f040d
1 parent
aa513de1
fix: DEFECT-679 modal height not fixed
Showing
2 changed files
with
11 additions
and
3 deletions
@@ -105,6 +105,7 @@ | @@ -105,6 +105,7 @@ | ||
105 | // 发送请求 | 105 | // 发送请求 |
106 | loading.value = true; | 106 | loading.value = true; |
107 | const res = await getDeviceHistoryInfo(searchParams); | 107 | const res = await getDeviceHistoryInfo(searchParams); |
108 | + loading.value = false; | ||
108 | // 判断数据对象是否为空 | 109 | // 判断数据对象是否为空 |
109 | if (!Object.keys(res).length) { | 110 | if (!Object.keys(res).length) { |
110 | isNull.value = false; | 111 | isNull.value = false; |
@@ -113,7 +114,6 @@ | @@ -113,7 +114,6 @@ | ||
113 | isNull.value = true; | 114 | isNull.value = true; |
114 | } | 115 | } |
115 | setChartOptions(res, value.keys); | 116 | setChartOptions(res, value.keys); |
116 | - loading.value = false; | ||
117 | }, | 117 | }, |
118 | }); | 118 | }); |
119 | 119 | ||
@@ -219,7 +219,11 @@ | @@ -219,7 +219,11 @@ | ||
219 | <div v-show="isNull" ref="chartRef" :style="{ height: '350px', width: '100%' }"> | 219 | <div v-show="isNull" ref="chartRef" :style="{ height: '350px', width: '100%' }"> |
220 | <Loading :loading="loading" :absolute="true" /> | 220 | <Loading :loading="loading" :absolute="true" /> |
221 | </div> | 221 | </div> |
222 | - <Empty description="暂无数据,请选择设备查询" v-show="!isNull" /> | 222 | + <Empty |
223 | + class="h-350px flex flex-col justify-center items-center" | ||
224 | + description="暂无数据,请选择设备查询" | ||
225 | + v-show="!isNull" | ||
226 | + /> | ||
223 | </section> | 227 | </section> |
224 | </section> | 228 | </section> |
225 | </BasicModal> | 229 | </BasicModal> |
@@ -44,7 +44,11 @@ | @@ -44,7 +44,11 @@ | ||
44 | <div v-show="isNull" ref="chartRef" :style="{ height: '550px', width }"> | 44 | <div v-show="isNull" ref="chartRef" :style="{ height: '550px', width }"> |
45 | <Loading :loading="loading" :absolute="true" /> | 45 | <Loading :loading="loading" :absolute="true" /> |
46 | </div> | 46 | </div> |
47 | - <Empty v-show="!isNull" /> | 47 | + <Empty |
48 | + :style="{ height: '550px', width }" | ||
49 | + class="flex flex-col justify-center items-center" | ||
50 | + v-show="!isNull" | ||
51 | + /> | ||
48 | </BasicModal> | 52 | </BasicModal> |
49 | <DeviceDetailDrawer @register="registerDetailDrawer" /> | 53 | <DeviceDetailDrawer @register="registerDetailDrawer" /> |
50 | </div> | 54 | </div> |