Merge branch 'fix/device-location' into 'main_dev'

fix: 修改设备编辑点击地图时回显问题

See merge request yunteng/thingskit-front!1022

@@ -116,6 +116,7 @@
   import { FileItem } from '/@/components/Form/src/components/ApiUpload.vue';
   import { buildUUID } from '/@/utils/uuid';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { computed } from 'vue';
 
   export default defineComponent({
     components: {
@@ -142,6 +143,10 @@
       const orgData: any = reactive({
         treeData: [],
       });
+      const isUpdate1 = computed(() => {
+        const { isUpdate } = props;
+        return isUpdate;
+      });
       const getOrganizationListFunc = async () => {
         const data = await getOrganizationList();
         copyTransFun(data as any as any[]);
@@ -235,11 +240,19 @@
       };
 
       // 地图的弹框
-      const spinning = ref<boolean>(true);
+      const spinning = ref<boolean>(false);
       const visible = ref(false);
       const selectPosition = async () => {
         visible.value = true;
-        if (!positionState.longitude) {
+        if (
+          !unref(isUpdate1) &&
+          unref(devicePositionState).longitude &&
+          unref(devicePositionState).latitude
+        ) {
+          positionState.longitude = unref(devicePositionState).longitude;
+          positionState.latitude = unref(devicePositionState).latitude;
+        }
+        if (!positionState.longitude || !positionState.latitude) {
           let getLocalCity = new BMap.LocalCity();
           let getLocation = new BMap.Geolocation();
           const userAgent = navigator.userAgent;
@@ -259,7 +272,6 @@
               });
             } else {
               await getLocation.getCurrentPosition(function (res) {
-                console.log(res, res);
                 positionState.longitude = res?.longitude || '104.05326410962411';
                 positionState.latitude = res?.latitude || '30.54855093076791';
                 var pt = new BMap.Point(positionState.longitude, positionState.latitude);
@@ -268,12 +280,13 @@
               });
             }
           } catch (err) {
-            console.log(err, 'err');
             createMessage.error('获取定位失败');
           }
           initMap(positionState.longitude, positionState.latitude);
         } else {
           initMap(positionState.longitude, positionState.latitude);
+          var pt = new BMap.Point(positionState.longitude, positionState.latitude);
+          getAddrByPoint(pt);
         }
       };