bdzl2/bxztApp
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
linhu 2025-11-19 10:09:09 +08:00
commit ed230e69ab
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue
View File

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

10
packages/screen/src/views/ServiceStationManagePage/detailDrawer.vue
View File

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