Commit 356ba0a0fd8c1bed4f2aa095612ee040f59eda81
1 parent
29e3131b
fix: HistoryData component import Loading compoonent faild
Showing
2 changed files
with
12 additions
and
3 deletions
... | ... | @@ -2,7 +2,7 @@ |
2 | 2 | import moment from 'moment'; |
3 | 3 | import { nextTick, onMounted, onUnmounted, Ref, ref, unref } from 'vue'; |
4 | 4 | import { getDeviceDataKeys, getDeviceHistoryInfo } from '/@/api/alarm/position'; |
5 | - import { Empty } from 'ant-design-vue'; | |
5 | + import { Empty, Spin } from 'ant-design-vue'; | |
6 | 6 | import { useECharts } from '/@/hooks/web/useECharts'; |
7 | 7 | import { dateUtil } from '/@/utils/dateUtil'; |
8 | 8 | import { |
... | ... | @@ -175,7 +175,7 @@ |
175 | 175 | </section> |
176 | 176 | <section class="bg-white p-3"> |
177 | 177 | <div v-show="isNull" ref="chartRef" :style="{ height: '550px', width: '100%' }"> |
178 | - <Loading :loading="loading" :absolute="true" /> | |
178 | + <Spin :spinning="loading" :absolute="true" /> | |
179 | 179 | </div> |
180 | 180 | <Empty v-show="!isNull" /> |
181 | 181 | </section> | ... | ... |
... | ... | @@ -15,6 +15,7 @@ |
15 | 15 | } from '/@/api/ota'; |
16 | 16 | import { useCopyToClipboard } from '/@/hooks/web/useCopyToClipboard'; |
17 | 17 | import { useDownload } from '../hook/useDownload'; |
18 | + // import DeviceDetailDrawer from '/@/views/device/list/cpns/modal/DeviceDetailDrawer.vue'; | |
18 | 19 | |
19 | 20 | const emit = defineEmits(['register', 'update:list']); |
20 | 21 | |
... | ... | @@ -46,7 +47,14 @@ |
46 | 47 | } catch (error) {} |
47 | 48 | }); |
48 | 49 | |
49 | - // const openDetailPage = () => {}; | |
50 | + // const [registerTBDrawer, TBDrawerMethod] = useDrawer(); | |
51 | + | |
52 | + // const openDetailPage = () => { | |
53 | + // TBDrawerMethod.openDrawer({ | |
54 | + // id: otaRecord.value.id.id, | |
55 | + // tbDeviceId: otaRecord.value.deviceProfileId.id, | |
56 | + // }); | |
57 | + // }; | |
50 | 58 | |
51 | 59 | const downloadPackage = async () => { |
52 | 60 | await useDownload(unref(otaRecord)); |
... | ... | @@ -138,5 +146,6 @@ |
138 | 146 | <Button type="primary" :loading="loading" @click="handleSubmit">保存</Button> |
139 | 147 | </div> |
140 | 148 | </template> |
149 | + <!-- <DeviceDetailDrawer @register="registerTBDrawer" /> --> | |
141 | 150 | </BasicDrawer> |
142 | 151 | </template> | ... | ... |