Merge branch 'dev' of http://222.212.85.86:8222/bdzl2/bxztApp into dev

packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue

@@ -194,16 +194,16 @@ onMounted(() => {
     //   ...DEFAULT_CAMERA_VIEW,
     // });
     camera.flyTo({
-      destination: defaultPoint.position,
+      ...DEFAULT_CAMERA_VIEW,
       duration: 1,
     });
     // 延迟 1000ms 后设置相机到默认位置
-    setTimeout(() => {
-      camera.flyTo({
-        destination: defaultPoint.position,
-        duration: 1,
-      });
-    }, 5000);
+    // setTimeout(() => {
+    //   camera.flyTo({
+    //     ...DEFAULT_CAMERA_VIEW,
+    //     duration: 1,
+    //   });
+    // }, 5000);
     return;
 
     /**

packages/screen/src/views/ServiceStationManagePage/detailDrawer.vue

@@ -395,9 +395,9 @@ const handleAdd = () => {
     case "people":
       model.title = "新增人员";
       model.content = PersonAddDialog;
-      peopleForm.value = { ...INIT_FORM_people };
+      Object.assign(peopleForm, INIT_FORM_people);
       model.props = {
-        form: peopleForm.value,
+        form: peopleForm,
       };
       model.onConfirm = handleAddPeopleConfirm;
       model.onCancel = handleCancel;
@@ -427,7 +427,7 @@ const handleAdd = () => {
       model.title = "新增设备";
       model.content = EquipmentAddDialog;
       // 重置表单
-      equipmentForm.value = { ...INIT_FORM_equipment };
+      Object.assign(equipmentForm, INIT_FORM_equipment);
       model.props = {
         form: equipmentForm,
         basicData: props.basicData,
@@ -485,6 +485,10 @@ const handleAddMaterialConfirm = async () => {
 // 新增设备
 const handleAddEquipmentConfirm = async () => {
   try {
+    const data = {
+      equipment: toRaw(equipmentForm),
+    };
+    console.log("data", data);
     const res = await request({
       url: "/snow-ops-platform/yjsb/add",
       method: "post",