diff --git a/src/api/wirelessintrusion/wirelessintrusion.js b/src/api/wirelessintrusion/wirelessintrusion.js index 45bf43b..ccc5022 100644 --- a/src/api/wirelessintrusion/wirelessintrusion.js +++ b/src/api/wirelessintrusion/wirelessintrusion.js @@ -195,4 +195,12 @@ export const queryLiveBack = (params) => { method: 'get', params: params }) +} +//查询摄像头设备 +export const getDeviceCamera = (params) => { + return request({ + url: '/api/safeCare/callBack/getDeviceCamera', + method: 'get', + params: params + }) } \ No newline at end of file diff --git a/src/views/wirelessintrusion/warn/record.vue b/src/views/wirelessintrusion/warn/record.vue index 359f9d0..17485b6 100644 --- a/src/views/wirelessintrusion/warn/record.vue +++ b/src/views/wirelessintrusion/warn/record.vue @@ -29,7 +29,7 @@
- @@ -327,9 +327,9 @@ export default { if (token == 'undefined' || !token) { bizLogin({ appKey: 'Arf7bd4f26', appSecret: 'kb207044c8' }).then(res => { window.sessionStorage.setItem('bizToken', res.data.data.token); - bizDeviceList(res.data.data.token, { 'params[pmac]': row.deviceId }).then(res2 => { + getDeviceCamera(res.data.data.token, { sn: row.hostSerialNumber }).then(res2 => { const data = res2.data; - this.videoData = data.rows; + this.videoData = data; if (this.videoData.length === 0) { this.$message.warning('未查询到该报警点摄像头'); } @@ -339,14 +339,14 @@ export default { }); }) } else { - bizDeviceList(token, { 'params[pmac]': row.deviceId }).then(res2 => { + getDeviceCamera(res.data.data.token, { sn: row.hostSerialNumber }).then(res2 => { if (res2.data.code == 401) { window.sessionStorage.removeItem('bizToken'); this.linkVideo(row); } else if (res2.data.code == 200) { const data = res2.data; - this.videoData = data.rows; + this.videoData = data; if (this.videoData.length === 0) { this.$message.warning('未查询到该报警点摄像头'); } diff --git a/vue.config.js b/vue.config.js index ef6870a..04ebf20 100644 --- a/vue.config.js +++ b/vue.config.js @@ -39,8 +39,8 @@ module.exports = { proxy: { "/api": { //本地服务接口地址 - target: 'http://192.168.1.34:81', - // target: 'http://192.168.3.32:81', + // target: 'http://192.168.1.34:81', + target: 'http://192.168.3.32:81', // target: 'http://192.168.1.102:81', ws: true, pathRewrite: {