From 3c81eadf02514c99f60b9324836b2efc7495881b Mon Sep 17 00:00:00 2001
From: Zzc <1373857752@qq.com>
Date: Wed, 19 Nov 2025 09:26:43 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E6=B3=A8=E9=87=8A=E5=9C=B0=E5=9B=BE?=
=?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/views/3DSituationalAwarenessRefactor/index.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue b/packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue
index 6b73b39..4b41b52 100644
--- a/packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue
+++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue
@@ -24,7 +24,7 @@
-
+
@@ -194,13 +194,13 @@ onMounted(() => {
// ...DEFAULT_CAMERA_VIEW,
// });
camera.flyTo({
- destination: defaultPoint.position,
+ ...DEFAULT_CAMERA_VIEW,
duration: 1,
});
// 延迟 1000ms 后设置相机到默认位置
setTimeout(() => {
camera.flyTo({
- destination: defaultPoint.position,
+ ...DEFAULT_CAMERA_VIEW,
duration: 1,
});
}, 5000);
From 18692c21578271db9a2436cdb657e2d12b77beb5 Mon Sep 17 00:00:00 2001
From: Zzc <1373857752@qq.com>
Date: Wed, 19 Nov 2025 09:29:47 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E5=9C=B0=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../views/3DSituationalAwarenessRefactor/index.vue | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue b/packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue
index 4b41b52..6b370e7 100644
--- a/packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue
+++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue
@@ -24,7 +24,7 @@
-
+
@@ -198,12 +198,12 @@ onMounted(() => {
duration: 1,
});
// 延迟 1000ms 后设置相机到默认位置
- setTimeout(() => {
- camera.flyTo({
- ...DEFAULT_CAMERA_VIEW,
- duration: 1,
- });
- }, 5000);
+ // setTimeout(() => {
+ // camera.flyTo({
+ // ...DEFAULT_CAMERA_VIEW,
+ // duration: 1,
+ // });
+ // }, 5000);
return;
/**
From 3d7c534bd7fe33f12c886c0d51d6334ee94fd39c Mon Sep 17 00:00:00 2001
From: huangchenhao <123673748@qq.com>
Date: Wed, 19 Nov 2025 09:32:42 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=85=BB=E6=8A=A4=E7=AB=99=20=E8=AE=BE?=
=?UTF-8?q?=E5=A4=87=E4=BF=A1=E6=81=AF=E6=96=B0=E5=A2=9E=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../views/ServiceStationManagePage/detailDrawer.vue | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/packages/screen/src/views/ServiceStationManagePage/detailDrawer.vue b/packages/screen/src/views/ServiceStationManagePage/detailDrawer.vue
index 675b442..e0df01a 100644
--- a/packages/screen/src/views/ServiceStationManagePage/detailDrawer.vue
+++ b/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",