diff --git a/.env.development b/.env.development index d4a2610..9293980 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ ENV = 'development' # 本地服地址 VUE_APP_BASE_API = 'http://192.168.99.112:8082' # VUE_APP_BASE_API = 'http://27.19.209.92:13244' -VUE_APP_LIB_API = 'http://118.253.150.248:8099' +VUE_APP_WEBRTCSTREAMER_API = '127.0.0.1:9527' # 是否启用 babel-plugin-dynamic-import-node插件 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/.env.production b/.env.production index 6356002..3d5f5bc 100644 --- a/.env.production +++ b/.env.production @@ -2,8 +2,7 @@ ENV = 'production' # 如果使用 Nginx 代理后端接口,那么此处需要改为 '/',文件查看 Docker 部署篇,Nginx 配置 # 接口地址,注意协议,如果你没有配置 ssl,需要将 https 改为 http -VUE_APP_BASE_API = 'http://192.168.1.80:7070' -VUE_APP_LIB_API = 'http://118.253.150.248:8099' -# VUE_APP_BASE_API = 'http://127.0.0.1:8080' +VUE_APP_BASE_API = 'http://192.168.99.112:11000' +VUE_APP_WEBRTCSTREAMER_API = '127.0.0.1:9527' # 如果接口是 http 形式, wss 需要改为 ws VUE_APP_WS_API = 'ws://192.168.1.80:7071' diff --git a/public/static/config.js b/public/static/config.js index ec33f9e..9fb2ff0 100644 --- a/public/static/config.js +++ b/public/static/config.js @@ -1,5 +1,5 @@ window.g = { AXIOS_TIMEOUT: 10000, - ApiUrl: 'http://192.168.99.112:8080', // 配置服务器地址, - LibUrl: 'http://118.253.150.248:8099' // 图创地址 + ApiUrl: 'http://192.168.99.112:11000', // 配置服务器地址, + ApiWebRtcServerUrl: '127.0.0.1:9527' // 配置视频数据流服务器地址, } diff --git a/public/webBasement/asset/F5.glb b/public/webBasement/asset/F5.glb index 3130aea..c5b022d 100644 Binary files a/public/webBasement/asset/F5.glb and b/public/webBasement/asset/F5.glb differ diff --git a/public/webFullView/asset/F5.glb b/public/webFullView/asset/F5.glb index 3e8494b..9743ce7 100644 Binary files a/public/webFullView/asset/F5.glb and b/public/webFullView/asset/F5.glb differ diff --git a/public/webThird/asset/F52.glb b/public/webThird/asset/F52.glb deleted file mode 100644 index d3ae6b4..0000000 Binary files a/public/webThird/asset/F52.glb and /dev/null differ diff --git a/public/webWater/asset/F51.glb b/public/webWater/asset/F51.glb deleted file mode 100644 index 810fbd6..0000000 Binary files a/public/webWater/asset/F51.glb and /dev/null differ diff --git a/public/webWater/asset/F52.glb b/public/webWater/asset/F52.glb deleted file mode 100644 index 5002a00..0000000 Binary files a/public/webWater/asset/F52.glb and /dev/null differ diff --git a/src/components/hkVideo.vue b/src/components/hkVideo.vue index 025d78a..9d757c2 100644 --- a/src/components/hkVideo.vue +++ b/src/components/hkVideo.vue @@ -42,6 +42,8 @@ export default { }) }, initVideo(rtsp_url) { + const linkSrc = process.env.NODE_ENV === 'production' ? window.g.ApiWebRtcServerUrl : process.env.VUE_APP_WEBRTCSTREAMER_API + this.camera_ip = linkSrc // video:需要绑定的video控件ID // 127.0.0.1:8000:启动webrtc-streamer的设备IP和端口,默认8000 // rtsp://admin:Hn123456.108@192.168.108.242:554/Streaming/Channels/102 @@ -49,7 +51,9 @@ export default { this.webRtcServer = new WebRtcStreamer('video', location.protocol + '//' + this.camera_ip) // 需要查看的rtsp地址,根据自己的摄像头传入对应的rtsp地址即可。注意:视频编码格式必须是H264的,否则无法正常显示,编码格式可在摄像头的后台更改 // this.webRtcServer.connect('rtsp://' + this.hkConfig.username + ':' + this.hkConfig.password + '@' + this.hkConfig.ip + ':' + this.hkConfig.port + '/Streaming/Channels/102') - this.webRtcServer.connect('rtsp://admin:1111@192.168.99.133:554/h264/ch1/main/av_stream') + // this.webRtcServer.connect('rtsp://admin:1111@192.168.99.133:554/h264/ch1/main/av_stream') + this.webRtcServer.connect('rtsp://admin:Hn123456.108@192.168.108.248:554/Streaming/Channels/1402') + // this.webRtcServer.connect(rtsp_url) } } } diff --git a/vue.config.js b/vue.config.js index e76bd83..2c4eb75 100644 --- a/vue.config.js +++ b/vue.config.js @@ -24,13 +24,6 @@ module.exports = { pathRewrite: { '^/qyzt': 'qyzt' } - }, - '/openlib/': { - target: process.env.VUE_APP_LIB_API, - changeOrigin: true, - pathRewrite: { - '^/openlib': 'openlib' - } } } },