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,7 +2,7 @@ | ||
2 | import moment from 'moment'; | 2 | import moment from 'moment'; |
3 | import { nextTick, onMounted, onUnmounted, Ref, ref, unref } from 'vue'; | 3 | import { nextTick, onMounted, onUnmounted, Ref, ref, unref } from 'vue'; |
4 | import { getDeviceDataKeys, getDeviceHistoryInfo } from '/@/api/alarm/position'; | 4 | import { getDeviceDataKeys, getDeviceHistoryInfo } from '/@/api/alarm/position'; |
5 | - import { Empty } from 'ant-design-vue'; | 5 | + import { Empty, Spin } from 'ant-design-vue'; |
6 | import { useECharts } from '/@/hooks/web/useECharts'; | 6 | import { useECharts } from '/@/hooks/web/useECharts'; |
7 | import { dateUtil } from '/@/utils/dateUtil'; | 7 | import { dateUtil } from '/@/utils/dateUtil'; |
8 | import { | 8 | import { |
@@ -175,7 +175,7 @@ | @@ -175,7 +175,7 @@ | ||
175 | </section> | 175 | </section> |
176 | <section class="bg-white p-3"> | 176 | <section class="bg-white p-3"> |
177 | <div v-show="isNull" ref="chartRef" :style="{ height: '550px', width: '100%' }"> | 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 | </div> | 179 | </div> |
180 | <Empty v-show="!isNull" /> | 180 | <Empty v-show="!isNull" /> |
181 | </section> | 181 | </section> |
@@ -15,6 +15,7 @@ | @@ -15,6 +15,7 @@ | ||
15 | } from '/@/api/ota'; | 15 | } from '/@/api/ota'; |
16 | import { useCopyToClipboard } from '/@/hooks/web/useCopyToClipboard'; | 16 | import { useCopyToClipboard } from '/@/hooks/web/useCopyToClipboard'; |
17 | import { useDownload } from '../hook/useDownload'; | 17 | import { useDownload } from '../hook/useDownload'; |
18 | + // import DeviceDetailDrawer from '/@/views/device/list/cpns/modal/DeviceDetailDrawer.vue'; | ||
18 | 19 | ||
19 | const emit = defineEmits(['register', 'update:list']); | 20 | const emit = defineEmits(['register', 'update:list']); |
20 | 21 | ||
@@ -46,7 +47,14 @@ | @@ -46,7 +47,14 @@ | ||
46 | } catch (error) {} | 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 | const downloadPackage = async () => { | 59 | const downloadPackage = async () => { |
52 | await useDownload(unref(otaRecord)); | 60 | await useDownload(unref(otaRecord)); |
@@ -138,5 +146,6 @@ | @@ -138,5 +146,6 @@ | ||
138 | <Button type="primary" :loading="loading" @click="handleSubmit">保存</Button> | 146 | <Button type="primary" :loading="loading" @click="handleSubmit">保存</Button> |
139 | </div> | 147 | </div> |
140 | </template> | 148 | </template> |
149 | + <!-- <DeviceDetailDrawer @register="registerTBDrawer" /> --> | ||
141 | </BasicDrawer> | 150 | </BasicDrawer> |
142 | </template> | 151 | </template> |