diff --git a/src/api/home.js b/src/api/home.js
index 753b8a7..b3eef9e 100644
--- a/src/api/home.js
+++ b/src/api/home.js
@@ -129,3 +129,7 @@ export const deletePersonApi = (data) => {
export const getDetailsApi = (data) => {
return service.get('/robot/sbdUser/getDetails', { params: data })
}
+// 设置预置位
+export const setDevicePresetApi2 = (data) => {
+ return service.post('/robot/instruct/sedXml', data)
+}
diff --git a/src/assets/map-wx.png b/src/assets/map-wx.png
new file mode 100644
index 0000000..f272d82
Binary files /dev/null and b/src/assets/map-wx.png differ
diff --git a/src/assets/map-wx2.png b/src/assets/map-wx2.png
new file mode 100644
index 0000000..b461ff5
Binary files /dev/null and b/src/assets/map-wx2.png differ
diff --git a/src/utils/initLogin.js b/src/utils/initLogin.js
index 7b0a98d..1fd8ba1 100644
--- a/src/utils/initLogin.js
+++ b/src/utils/initLogin.js
@@ -47,3 +47,8 @@ export const openDeviceMKApi = (data) => {
export const stopDeviceMKApi = (data) => {
return service.post('/icvs/audio/stopTalk?token=' + data.token, data)
}
+
+// 设置预置位
+export const setDevicePresetApi = (data) => {
+ return service.post('/PTZ/C_PTZ_SetPresetPos?token=' + data.token, data)
+}
diff --git a/src/views/home/components/left-two.vue b/src/views/home/components/left-two.vue
index 4d63ee2..6a42bfd 100644
--- a/src/views/home/components/left-two.vue
+++ b/src/views/home/components/left-two.vue
@@ -5,6 +5,7 @@
+
+
+
+
地图切换
@@ -27,7 +32,8 @@
import { ref, nextTick, onMounted } from 'vue'
import TitleBackground from '@/components/TitleBackground/index.vue'
import { getRobotDeviceListFn, getRobotMapInfoFn, getRobotPointsInfoFn } from '@/utils/getRobotInfo'
-import imgSrc from '@/assets/demo.png'
+import imgSrc from '@/assets/map-wx.png'
+import imgSrc1 from '@/assets/map-wx2.png'
const mapTitle = ref('巡检地图') // 地图标题
const svgMapRef = ref(null) // 地图svg引用
@@ -65,7 +71,7 @@ const markPoints = (Robot_x, Robot_y) => {
const onHandleMapSwitch = () => {
isMapSwitch.value = !isMapSwitch.value
- mapImage.value = isMapSwitch.value ? imgSrc : mapInfo.value?.mapBase64
+ // mapImage.value = isMapSwitch.value ? imgSrc : mapInfo.value?.mapBase64
}
onMounted(async () => {
@@ -105,6 +111,18 @@ onMounted(async () => {
position: absolute;
}
+ .map-image {
+ position: absolute;
+ top: 0;
+ left: 0;
+ bottom: 0;
+ right: 0;
+ z-index: 2;
+ background: url('@/assets/map-wx.png') no-repeat center center;
+ background-size: 100% 100%;
+ opacity: 0.8;
+ }
+
.map-switch-btn {
position: absolute;
right: 4px;
diff --git a/src/views/home/components/modal-content/add-or-edit-form.vue b/src/views/home/components/modal-content/add-or-edit-form.vue
index c4eea79..0ea05a9 100644
--- a/src/views/home/components/modal-content/add-or-edit-form.vue
+++ b/src/views/home/components/modal-content/add-or-edit-form.vue
@@ -195,7 +195,7 @@
clearable
v-model:value="item.pointName"
:options="markerPointList"
- style="width: 110px"
+ style="width: 240px"
@update:value="handleChangePointName($event, index)"
/>
@@ -1049,7 +1049,7 @@ watch(
/* background: skyblue; */
.svg-map-container {
- background: skyblue;
+ // background: skyblue;
}
}
diff --git a/src/views/home/components/modal-content/add-or-edit-marker-form.vue b/src/views/home/components/modal-content/add-or-edit-marker-form.vue
index 23bf950..fec9be0 100644
--- a/src/views/home/components/modal-content/add-or-edit-marker-form.vue
+++ b/src/views/home/components/modal-content/add-or-edit-marker-form.vue
@@ -78,12 +78,12 @@
-
+
+
+
+ 设置预置位
+
@@ -151,7 +155,8 @@ import ControlDeck from './control-deck.vue'
import { useMessage, useDialog } from 'naive-ui'
import { watch, ref, onMounted, nextTick, onBeforeUnmount } from 'vue'
import { getRobotTokenFn, getRobotDeviceListFn, getRobotMapInfoFn } from '@/utils/getRobotInfo'
-import { handleRobotActionApi, addMarkerApi } from '@/api/home'
+import { handleRobotActionApi, addMarkerApi, setDevicePresetApi2 } from '@/api/home'
+import { setDevicePresetApi } from '@/utils/initLogin'
const message = useMessage()
const deviceToken = ref('')
@@ -272,6 +277,34 @@ const getRobotCurrentPosition = async (puId) => {
}
}
+// 设置预置位()
+const onHandleSetPreset = async () => {
+ // const params = {
+ // idx: 0,
+ // token: deviceToken.value,
+ // puid: deviceInfo.value?.puId,
+ // PresetPos: markerParams.value.preset,
+ // Name: markerParams.value.markerName,
+ // }
+
+ // const res = setDevicePresetApi(params)
+ // console.log('设置预置位返回结果', res)
+
+ const params = {
+ puId: deviceInfo.value?.puId,
+ type: '21',
+ value: markerParams.value.preset,
+ name: 'robot' + markerParams.value.preset,
+ }
+
+ const { data: res } = await setDevicePresetApi2(params)
+ if (res.data.code == 200) {
+ message.success('预置位设置成功')
+ } else {
+ message.error('预置位设置失败')
+ }
+}
+
// 新增或者修改点位
const addOrEditMarker = async (isCurrentPosition, isSuccess) => {
@@ -398,7 +431,7 @@ watch(
markerParams.value.markerY1 = newVal?.markerY1
markerParams.value.markerName = newVal?.markerName
markerParams.value.markerAngle = newVal?.markerAngle
- markerParams.value.markerPreset = newVal?.markerPreset
+ markerParams.value.preset = newVal?.markerPreset
markerParams.value.xCount = Math.ceil(newVal?.xCount).toString()
markerParams.value.yCount = Math.ceil(newVal?.yCount).toString()
diff --git a/src/views/home/components/modal-content/preset-setting.vue b/src/views/home/components/modal-content/preset-setting.vue
index 68b0355..f04a9dc 100644
--- a/src/views/home/components/modal-content/preset-setting.vue
+++ b/src/views/home/components/modal-content/preset-setting.vue
@@ -3,7 +3,7 @@
@@ -756,6 +756,7 @@ const getMarkerListAll = async () => {
markerY1: logicalY1,
markerName: item.pointName,
markerAngle: item.theta,
+ markerPreset: item.preset,
isAdd: false,
})
diff --git a/src/views/home/components/right-two/taps-three.vue b/src/views/home/components/right-two/taps-three.vue
index 0bbeea0..ef65677 100644
--- a/src/views/home/components/right-two/taps-three.vue
+++ b/src/views/home/components/right-two/taps-three.vue
@@ -100,14 +100,14 @@ const endImage = ref('')
const imgPreviewUrl = import.meta.env.VITE_APP_imgPreviewUrl
const isSendOptions = ref([
- { label: '正常', value: '1' },
- { label: '异常', value: '0' },
+ { label: '正常', value: '0' },
+ { label: '异常', value: '1' },
])
const queryParams = ref({
pageNum: 1,
pageSize: 10,
pointName: '',
- status: '',
+ status: null,
type: 996,
})