Merge branch 'ww' into 'main'

fix: add device location chart loading

See merge request huang/yun-teng-iot-front!244

@@ -40,7 +40,9 @@
       :canFullscreen="false"
       :canFullscreen="false"
     >
     >
       <BasicForm @register="registerForm" />
       <BasicForm @register="registerForm" />
-      <div v-show="isNull" ref="chartRef" :style="{ height: '600px', width }"></div>
+      <div v-show="isNull" ref="chartRef" :style="{ height: '600px', width }">
+        <Loading :loading="loading" :absolute="true" />
+      </div>
       <Empty v-show="!isNull" />
       <Empty v-show="!isNull" />
     </BasicModal>
     </BasicModal>
     <DeviceDetailDrawer @register="registerDetailDrawer" />
     <DeviceDetailDrawer @register="registerDetailDrawer" />
@@ -74,6 +76,7 @@
   import djh from '/@/assets/images/djh.png';
   import djh from '/@/assets/images/djh.png';
   import online from '/@/assets/images/online1.png';
   import online from '/@/assets/images/online1.png';
   import lx1 from '/@/assets/images/lx1.png';
   import lx1 from '/@/assets/images/lx1.png';
+  import Loading from '/@/components/Loading/src/Loading.vue';
   export default defineComponent({
   export default defineComponent({
     name: 'BaiduMap',
     name: 'BaiduMap',
     components: {
     components: {
@@ -83,6 +86,7 @@
       BasicModal,
       BasicModal,
       BasicForm,
       BasicForm,
       DeviceDetailDrawer,
       DeviceDetailDrawer,
+      Loading,
     },
     },
     props: {
     props: {
       width: {
       width: {
@@ -105,6 +109,7 @@
       const { toPromise } = useScript({ src: BAI_DU_MAP_URL });
       const { toPromise } = useScript({ src: BAI_DU_MAP_URL });
       const [registerDetailDrawer, { openDrawer }] = useDrawer();
       const [registerDetailDrawer, { openDrawer }] = useDrawer();
       const [registerModal, { openModal }] = useModal();
       const [registerModal, { openModal }] = useModal();
+      const loading = ref(false);
       const [
       const [
         registerForm,
         registerForm,
         { resetFields, getFieldsValue, setFieldsValue, validate, updateSchema },
         { resetFields, getFieldsValue, setFieldsValue, validate, updateSchema },
@@ -121,6 +126,7 @@
           const startTs = Date.now() - endTs;
           const startTs = Date.now() - endTs;
           endTs = Date.now();
           endTs = Date.now();
           // 发送请求
           // 发送请求
+          loading.value = true;
           const res = await getDeviceHistoryInfo({
           const res = await getDeviceHistoryInfo({
             entityId,
             entityId,
             keys: keys.join(),
             keys: keys.join(),
@@ -188,6 +194,7 @@
             },
             },
             series,
             series,
           });
           });
+          loading.value = false;
         },
         },
       });
       });
       const [registerTable] = useTable({
       const [registerTable] = useTable({
@@ -439,6 +446,7 @@
         isNull,
         isNull,
         cancelHistoryModal,
         cancelHistoryModal,
         registerDetailDrawer,
         registerDetailDrawer,
+        loading,
       };
       };
     },
     },
   });
   });