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

fix: 修改设备位置第一次需要点击地图才显示位置问题

See merge request yunteng/thingskit-front!821

@@ -145,6 +145,8 @@
           // !!!此处需要删除地图的属性，否则会报堆栈溢出的错误 Uncaught RangeError: Maximum call stack size exceeded
           // !!!此处需要删除地图的属性，否则会报堆栈溢出的错误 Uncaught RangeError: Maximum call stack size exceeded
           Reflect.deleteProperty(DeviceStep1Ref.value.positionState, 'map');
           Reflect.deleteProperty(DeviceStep1Ref.value.positionState, 'map');
           Reflect.deleteProperty(DeviceStep1Ref.value.positionState, 'marker');
           Reflect.deleteProperty(DeviceStep1Ref.value.positionState, 'marker');
+          Reflect.deleteProperty(DeviceStep1Ref.value.devicePositionState, 'map');
+          Reflect.deleteProperty(DeviceStep1Ref.value.devicePositionState, 'marker');
           setModalProps({
           setModalProps({
             confirmLoading: true,
             confirmLoading: true,
           });
           });
@@ -156,7 +158,7 @@
               customerId: currentDeviceData.customerId,
               customerId: currentDeviceData.customerId,
               deviceInfo: {
               deviceInfo: {
                 avatar: DeviceStep1Ref.value?.devicePic,
                 avatar: DeviceStep1Ref.value?.devicePic,
-                ...DeviceStep1Ref.value?.positionState,
+                ...DeviceStep1Ref.value?.devicePositionState,
               },
               },
             };
             };
             validateNameLength(stepRecord.name);
             validateNameLength(stepRecord.name);
@@ -168,7 +170,7 @@
               sn: stepRecord.name,
               sn: stepRecord.name,
               deviceInfo: {
               deviceInfo: {
                 avatar: DeviceStep1Ref.value?.devicePic,
                 avatar: DeviceStep1Ref.value?.devicePic,
-                ...DeviceStep1Ref.value?.positionState,
+                ...DeviceStep1Ref.value?.devicePositionState,
               },
               },
               deviceToken:
               deviceToken:
                 unref(current) === 0 || !unref(stepState).addAgree
                 unref(current) === 0 || !unref(stepState).addAgree

@@ -46,7 +46,7 @@
           </div>
           </div>
         </template>
         </template>
         <template #deviceAddress>
         <template #deviceAddress>
-          <Input disabled v-model:value="positionState.address">
+          <Input disabled v-model:value="devicePositionState.address">
             <template #addonAfter>
             <template #addonAfter>
               <EnvironmentTwoTone @click="selectPosition" />
               <EnvironmentTwoTone @click="selectPosition" />
             </template>
             </template>
@@ -128,6 +128,7 @@
   import { useDrawer } from '/@/components/Drawer';
   import { useDrawer } from '/@/components/Drawer';
   import DeptDrawer from '/@/views/system/organization/OrganizationDrawer.vue';
   import DeptDrawer from '/@/views/system/organization/OrganizationDrawer.vue';
   import { TaskTypeEnum } from '/@/views/task/center/config';
   import { TaskTypeEnum } from '/@/views/task/center/config';
+  import { toRaw } from 'vue';
 
 
   export default defineComponent({
   export default defineComponent({
     components: {
     components: {
@@ -239,8 +240,14 @@
       const selectPosition = () => {
       const selectPosition = () => {
         visible.value = true;
         visible.value = true;
         if (!positionState.longitude) {
         if (!positionState.longitude) {
-          positionState.longitude = '104.04666605565338';
-          positionState.latitude = '30.543516387560476';
+          positionState.longitude = '104.05326410962411';
+          positionState.latitude = '30.54855093076791';
+
+          // 根据经纬度获取详细位置
+          if (positionState.longitude && positionState.latitude) {
+            var pt = new BMap.Point(positionState.longitude, positionState.latitude);
+            getAddrByPoint(pt);
+          }
           initMap(positionState.longitude, positionState.latitude);
           initMap(positionState.longitude, positionState.latitude);
         } else {
         } else {
           initMap(positionState.longitude, positionState.latitude);
           initMap(positionState.longitude, positionState.latitude);
@@ -261,6 +268,15 @@
         map: null,
         map: null,
         marker: null,
         marker: null,
       });
       });
+
+      const devicePositionState = ref({
+        longitude: '',
+        latitude: '',
+        address: '',
+        map: null,
+        marker: null,
+      });
+
       /**
       /**
        * 逆地址解析函数（根据坐标点获取详细地址）
        * 逆地址解析函数（根据坐标点获取详细地址）
        * @param {Object} point   百度地图坐标点，必传
        * @param {Object} point   百度地图坐标点，必传
@@ -371,6 +387,7 @@
       // 确定选择的位置
       // 确定选择的位置
       const handleOk = () => {
       const handleOk = () => {
         visible.value = false;
         visible.value = false;
+        devicePositionState.value = { ...toRaw(positionState) };
       };
       };
       // 取消选择位置
       // 取消选择位置
       const handleCancel = () => {
       const handleCancel = () => {
@@ -385,6 +402,7 @@
         positionState.longitude = deviceInfo.longitude;
         positionState.longitude = deviceInfo.longitude;
         positionState.latitude = deviceInfo.latitude;
         positionState.latitude = deviceInfo.latitude;
         positionState.address = deviceInfo.address;
         positionState.address = deviceInfo.address;
+        devicePositionState.value = { ...toRaw(positionState) };
         devicePic.value = deviceInfo.avatar;
         devicePic.value = deviceInfo.avatar;
         setFieldsValue({
         setFieldsValue({
           ...data,
           ...data,
@@ -418,11 +436,13 @@
       function parentResetDevicePic(deviceInfo) {
       function parentResetDevicePic(deviceInfo) {
         devicePic.value = deviceInfo.avatar;
         devicePic.value = deviceInfo.avatar;
       }
       }
+
       // 父组件重置位置
       // 父组件重置位置
       function parentResetPositionState() {
       function parentResetPositionState() {
         for (let key in positionState) {
         for (let key in positionState) {
           positionState[key] = '';
           positionState[key] = '';
         }
         }
+        devicePositionState.value = { ...toRaw(positionState) };
       }
       }
       // 禁用设备类型
       // 禁用设备类型
       function disabledDeviceType(disabled: boolean) {
       function disabledDeviceType(disabled: boolean) {
@@ -474,6 +494,7 @@
         handleOpenOrgDrawer,
         handleOpenOrgDrawer,
         handleSuccess,
         handleSuccess,
         handleTreeOrg,
         handleTreeOrg,
+        devicePositionState,
       };
       };
     },
     },
   });
   });