diff --git a/.env.development b/.env.development index e617ab3..f32d1fd 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VITE_APP_TITLE = 新能源场站智慧运维平台 VITE_APP_ENV = 'development' # 开发环境 -VITE_APP_BASE_API = 'http://192.168.110.194:18899' +VITE_APP_BASE_API = 'http://192.168.110.125:18899' # 应用访问路径 例如使用前缀 /admin/ VITE_APP_CONTEXT_PATH = '/' diff --git a/src/api/devicePreset/index.ts b/src/api/devicePreset/index.ts index d5baf2e..7011745 100644 --- a/src/api/devicePreset/index.ts +++ b/src/api/devicePreset/index.ts @@ -10,7 +10,7 @@ import { DevicePresetVO, DevicePresetForm, DevicePresetQuery } from '@/api/camer export const listDevicePreset = (query?: DevicePresetQuery): AxiosPromise => { return request({ - url: '/camera/devicePreset/list', + url: '/ops/devicePreset/list', method: 'get', params: query }); @@ -22,7 +22,7 @@ export const listDevicePreset = (query?: DevicePresetQuery): AxiosPromise => { return request({ - url: '/camera/devicePreset/' + id, + url: '/ops/devicePreset/' + id, method: 'get' }); }; @@ -33,7 +33,7 @@ export const getDevicePreset = (id: string | number): AxiosPromise { return request({ - url: '/camera/devicePreset', + url: '/ops/devicePreset', method: 'post', data: data }); @@ -45,7 +45,7 @@ export const addDevicePreset = (data: DevicePresetForm) => { */ export const updateDevicePreset = (data: DevicePresetForm) => { return request({ - url: '/camera/devicePreset', + url: '/ops/devicePreset', method: 'put', data: data }); @@ -57,7 +57,7 @@ export const updateDevicePreset = (data: DevicePresetForm) => { */ export const delDevicePreset = (id: string | number | Array) => { return request({ - url: '/camera/devicePreset/' + id, + url: '/ops/devicePreset/' + id, method: 'delete' }); }; @@ -67,7 +67,7 @@ export const delDevicePreset = (id: string | number | Array) => */ export const callDevicePreset = (data: DevicePresetForm) => { return request({ - url: '/camera/devicePreset/call', + url: '/ops/devicePreset/callYzd', method: 'post', data: data }); diff --git a/src/api/securitySurveillance/index.js b/src/api/securitySurveillance/index.js index 1ec5c7e..562a669 100644 --- a/src/api/securitySurveillance/index.js +++ b/src/api/securitySurveillance/index.js @@ -14,3 +14,10 @@ export function getMonitoringList(data) { data }) } +// 获取首页大屏数据 +export function getHomeScreenData() { + return request({ + url: '/ops/monitoriing/getMonitoringDp', + method: 'get', + }) +} diff --git a/src/views/camera/components/presetAdd.vue b/src/views/camera/components/presetAdd.vue index ccfd69b..7b99901 100644 --- a/src/views/camera/components/presetAdd.vue +++ b/src/views/camera/components/presetAdd.vue @@ -55,6 +55,8 @@ import { ref, onBeforeUnmount, getCurrentInstance, nextTick } from 'vue'; import { ElMessageBox, ElMessage } from 'element-plus'; import { listDevicePreset, addDevicePreset, updateDevicePreset, delDevicePreset, callDevicePreset } from '@/api/devicePreset'; +import { getToken } from '@/api/securitySurveillance/index.js'; + import EZUIKit from 'ezuikit-js'; const emit = defineEmits(['update']); @@ -127,8 +129,8 @@ function addPre() { function videoPlay(obj: any) { console.log('objobjobj', obj); - getAccessToken().then((res: any) => { - if (res.code == 200 && obj.deviceSerial) { + getToken().then((res: any) => { + if (res.msg == "ok" && obj.deviceSerial) { flvPlayer.value = new EZUIKit.EZUIKitPlayer({ audio: '0', id: 'video-container', @@ -211,7 +213,12 @@ function handleDelete(row: any) { // 调用 function handleDebug(row: any) { - callDevicePreset(row.id).then((res: any) => { + callDevicePreset([{ + deviceSerial: row.deviceSerial, + presetIndex: row.presetIndex, + channelNo: "1", + id: row.id + }]).then((res: any) => { if (res.code === 200) { ElMessage.success('调用成功'); } diff --git a/src/views/camera/index.vue b/src/views/camera/index.vue index a052ae5..0088e9c 100644 --- a/src/views/camera/index.vue +++ b/src/views/camera/index.vue @@ -137,7 +137,7 @@ {{ scope.row.projectName ? scope.row.projectName : '未分配' }} --> - +