From 624c55c4b1fcc5d0ec1dd9b7b538b8ca0da37d70 Mon Sep 17 00:00:00 2001 From: zhangmj <1373657463@qq.com> Date: Fri, 26 Dec 2025 00:19:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E4=BA=BA=E6=9C=BA=E6=8E=A5=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 8 +- src/api/device.js | 28 ++- src/components/Map/index.vue | 4 +- src/components/Map/window/uav.vue | 244 ++++++++++++++++++++++++++- src/views/business/alarm/monitor.vue | 2 + src/views/business/wall/grid.vue | 33 +++- src/views/business/wall/index.vue | 2 +- src/views/business/wall/tree.vue | 15 +- 8 files changed, 308 insertions(+), 28 deletions(-) diff --git a/.env.production b/.env.production index 0639041..7b472cf 100644 --- a/.env.production +++ b/.env.production @@ -7,7 +7,7 @@ VITE_APP_BASE_URL = 'http://198.16.74.211:7284/api' # 智能体访问地址 VITE_APP_MODEL_URL = 'http://198.16.74.211:7284/zhinengti' # 海康播放插件配置 -VITE_APP_HAIKANG_SECRET = 'pvQSichVMqtLGh4Ltedo' -VITE_APP_HAIKANG_APPKEY = '28273161' -VITE_APP_HAIKANG_IP = '39.175.75.233' -VITE_APP_HAIKANG_PORT = 10443 +VITE_APP_HAIKANG_SECRET = 'DL6W0UBiH5iLrqCn6330' +VITE_APP_HAIKANG_APPKEY = '28091035' +VITE_APP_HAIKANG_IP = '198.16.74.206' +VITE_APP_HAIKANG_PORT = 443 \ No newline at end of file diff --git a/src/api/device.js b/src/api/device.js index 266ad1d..4e78b63 100644 --- a/src/api/device.js +++ b/src/api/device.js @@ -10,9 +10,26 @@ export const videoCameraFindPage = (data) => { return request({ url: '/videoCamera/findPage', method: 'post', + data: data, + headers: { + 'Content-Type': 'application/x-www-form-urlencoded' + } + }) +} +/** + * 分页查询监控设备列表 + * 查询 + * @param data + * @returns {*} + */ +export const findVideoLevelList = (data) => { + return request({ + url: '/fishingPort/dsVideo/findVideoLevelList', + method: 'post', data: data }) } + /** * 原有监控点位 * 查询 @@ -23,10 +40,8 @@ export const dsVideoList = (data) => { return request({ url: '/fishingPort/dsVideo/getList', method: 'post', - data: data, - headers: { - 'Content-Type': 'application/json;charset=utf-8' - } + data: data + }) } /** @@ -39,7 +54,10 @@ export const findUavPage = (data) => { return request({ url: '/videoCamera/findUavPage', method: 'post', - data: data + data: data, + headers: { + 'Content-Type': 'application/x-www-form-urlencoded' + } }) } /** diff --git a/src/components/Map/index.vue b/src/components/Map/index.vue index 32a8491..7bef8d6 100644 --- a/src/components/Map/index.vue +++ b/src/components/Map/index.vue @@ -189,7 +189,9 @@ const addUAVToMap = () => { if (circleGeometry) { circleGeometry.show() } - mapStore.updateWindowInfo({ visible: true, type: '_UAV', data: { ...item } }) + if(item.sourceType) { + mapStore.updateWindowInfo({ visible: true, type: '_UAV', data: { ...item } }) + } }) } }) diff --git a/src/components/Map/window/uav.vue b/src/components/Map/window/uav.vue index 66f5235..e1422ba 100644 --- a/src/components/Map/window/uav.vue +++ b/src/components/Map/window/uav.vue @@ -1,27 +1,259 @@