Commit 2da05dad32d9ef475ad077c3a8ba02965182ad35
1 parent
372beb53
fix: add device location chart loading
Showing
1 changed file
with
9 additions
and
1 deletions
... | ... | @@ -40,7 +40,9 @@ |
40 | 40 | :canFullscreen="false" |
41 | 41 | > |
42 | 42 | <BasicForm @register="registerForm" /> |
43 | - <div v-show="isNull" ref="chartRef" :style="{ height: '600px', width }"></div> | |
43 | + <div v-show="isNull" ref="chartRef" :style="{ height: '600px', width }"> | |
44 | + <Loading :loading="loading" :absolute="true" /> | |
45 | + </div> | |
44 | 46 | <Empty v-show="!isNull" /> |
45 | 47 | </BasicModal> |
46 | 48 | <DeviceDetailDrawer @register="registerDetailDrawer" /> |
... | ... | @@ -74,6 +76,7 @@ |
74 | 76 | import djh from '/@/assets/images/djh.png'; |
75 | 77 | import online from '/@/assets/images/online1.png'; |
76 | 78 | import lx1 from '/@/assets/images/lx1.png'; |
79 | + import Loading from '/@/components/Loading/src/Loading.vue'; | |
77 | 80 | export default defineComponent({ |
78 | 81 | name: 'BaiduMap', |
79 | 82 | components: { |
... | ... | @@ -83,6 +86,7 @@ |
83 | 86 | BasicModal, |
84 | 87 | BasicForm, |
85 | 88 | DeviceDetailDrawer, |
89 | + Loading, | |
86 | 90 | }, |
87 | 91 | props: { |
88 | 92 | width: { |
... | ... | @@ -105,6 +109,7 @@ |
105 | 109 | const { toPromise } = useScript({ src: BAI_DU_MAP_URL }); |
106 | 110 | const [registerDetailDrawer, { openDrawer }] = useDrawer(); |
107 | 111 | const [registerModal, { openModal }] = useModal(); |
112 | + const loading = ref(false); | |
108 | 113 | const [ |
109 | 114 | registerForm, |
110 | 115 | { resetFields, getFieldsValue, setFieldsValue, validate, updateSchema }, |
... | ... | @@ -121,6 +126,7 @@ |
121 | 126 | const startTs = Date.now() - endTs; |
122 | 127 | endTs = Date.now(); |
123 | 128 | // 发送请求 |
129 | + loading.value = true; | |
124 | 130 | const res = await getDeviceHistoryInfo({ |
125 | 131 | entityId, |
126 | 132 | keys: keys.join(), |
... | ... | @@ -188,6 +194,7 @@ |
188 | 194 | }, |
189 | 195 | series, |
190 | 196 | }); |
197 | + loading.value = false; | |
191 | 198 | }, |
192 | 199 | }); |
193 | 200 | const [registerTable] = useTable({ |
... | ... | @@ -434,6 +441,7 @@ |
434 | 441 | isNull, |
435 | 442 | cancelHistoryModal, |
436 | 443 | registerDetailDrawer, |
444 | + loading, | |
437 | 445 | }; |
438 | 446 | }, |
439 | 447 | }); | ... | ... |