diff --git a/src/assets/images/map_tools/icon1.png b/src/assets/images/map_tools/icon1.png
new file mode 100644
index 0000000..02d8bbc
Binary files /dev/null and b/src/assets/images/map_tools/icon1.png differ
diff --git a/src/assets/images/map_tools/icon2.png b/src/assets/images/map_tools/icon2.png
new file mode 100644
index 0000000..adb8225
Binary files /dev/null and b/src/assets/images/map_tools/icon2.png differ
diff --git a/src/assets/images/map_tools/icon3.png b/src/assets/images/map_tools/icon3.png
new file mode 100644
index 0000000..b907b29
Binary files /dev/null and b/src/assets/images/map_tools/icon3.png differ
diff --git a/src/components/map_tools/index.vue b/src/components/map_tools/index.vue
index 1ab30e0..ddb9ea2 100644
--- a/src/components/map_tools/index.vue
+++ b/src/components/map_tools/index.vue
@@ -1,16 +1,29 @@
-
完成绘制
-
清除绘制
-
还原建筑
-
当前选中楼层id:{{ model_id }}
+
+
+
+
+
+
+
完成绘制
+
+
+
+
+
+
清除绘制
+
+
+
+
+
+
还原建筑
+
+
+
当前选中楼层id:{{ model_id }}
+
@@ -32,22 +45,18 @@ import { getEnterpriseInfo } from "@/request/enterprise_management.js";
const props = defineProps({
type: {
type: Number,
- required: true,
default: 1,
},
positions: {
type: Array,
- required: true,
default: () => [],
},
position: {
type: Array,
- required: true,
default: () => [],
},
modUuid: {
type: String,
- required: true,
default: "",
},
});
@@ -88,17 +97,48 @@ onBeforeUnmount(() => {
window.$carmer = null;
});
+
diff --git a/src/views/alarm_configuration/other_alarm_configurations/index.vue b/src/views/alarm_configuration/other_alarm_configurations/index.vue
index c0c2b65..fd2044b 100644
--- a/src/views/alarm_configuration/other_alarm_configurations/index.vue
+++ b/src/views/alarm_configuration/other_alarm_configurations/index.vue
@@ -111,7 +111,6 @@ import { nextTick, reactive } from "vue";
const props = defineProps({
isGatheringAlarm: {
type: String,
- required: true,
default: "0",
},
});
diff --git a/src/views/map_settings/assignment_ticket_area_settings/components/selecting_points.vue b/src/views/map_settings/assignment_ticket_area_settings/components/selecting_points.vue
index 7373fd4..a0b6a9d 100644
--- a/src/views/map_settings/assignment_ticket_area_settings/components/selecting_points.vue
+++ b/src/views/map_settings/assignment_ticket_area_settings/components/selecting_points.vue
@@ -1,6 +1,6 @@
-
+
关闭
保存
@@ -23,9 +23,9 @@ const props = defineProps({
default: false,
},
id: {
- type: Number,
+ type: String,
required: true,
- default: 0,
+ default: "",
},
});
const emits = defineEmits(["update:visible", "get-data"]);
diff --git a/src/views/map_settings/assignment_ticket_area_settings/index.vue b/src/views/map_settings/assignment_ticket_area_settings/index.vue
index f1ff683..02de44f 100644
--- a/src/views/map_settings/assignment_ticket_area_settings/index.vue
+++ b/src/views/map_settings/assignment_ticket_area_settings/index.vue
@@ -129,7 +129,6 @@ import SelectingPoints from "./components/selecting_points.vue";
const props = defineProps({
type: {
type: String,
- required: true,
default: "1",
},
});
diff --git a/src/views/video_manager/video_manager/components/selecting_points.vue b/src/views/video_manager/video_manager/components/selecting_points.vue
index 4b4a939..0b3f55a 100644
--- a/src/views/video_manager/video_manager/components/selecting_points.vue
+++ b/src/views/video_manager/video_manager/components/selecting_points.vue
@@ -1,11 +1,6 @@
-
+
关闭
保存
@@ -28,9 +23,9 @@ const props = defineProps({
default: false,
},
id: {
- type: Number,
+ type: String,
required: true,
- default: 0,
+ default: "",
},
});
const emits = defineEmits(["update:visible", "get-data"]);
@@ -46,7 +41,12 @@ const fnSubmit = debounce(
ElMessage.warning("请选择坐标点");
return;
}
- await setPositioning({ camId: props.id, lon: position.value[0], lat: position.value[1], alt: position.value[2] });
+ await setPositioning({
+ camId: props.id,
+ lon: position.value[0],
+ lat: position.value[1],
+ alt: position.value[2],
+ });
ElMessage.success("保存成功");
fnClose();
emits("get-data");