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