diff --git a/.env.development b/.env.development index 8a258ab..c5eb65f 100644 --- a/.env.development +++ b/.env.development @@ -6,6 +6,7 @@ ENV = 'development' VUE_APP_BASE_API = 'http://192.168.99.72:12010' #VUE_APP_BASE_API = 'http://192.168.99.86:12010' #VUE_APP_BASE_API = 'http://27.19.205.234:17070' +VUE_APP_WEBRTCSTREAMER_API = '127.0.0.1:8000' # 是否启用 babel-plugin-dynamic-import-node插件 diff --git a/.env.production b/.env.production index 1c7f8fc..afe81db 100644 --- a/.env.production +++ b/.env.production @@ -5,6 +5,7 @@ ENV = 'production' #VUE_APP_BASE_API = 'http://192.168.3.220:12010' VUE_APP_BASE_API = 'http://192.168.99.86:12010' +VUE_APP_WEBRTCSTREAMER_API = '127.0.0.1:8000' # 如果接口是 http 形式, wss 需要改为 ws #VUE_APP_WS_API = 'ws://27.16.212.58:11100' #VUE_APP_CAMERA_API = '192.168.99.107:3000' diff --git a/public/static/config.js b/public/static/config.js index d1e55cb..2064243 100644 --- a/public/static/config.js +++ b/public/static/config.js @@ -2,9 +2,5 @@ window.g = { AXIOS_TIMEOUT: 10000, //ApiUrl: 'http://192.168.3.220:12010', // 江夏配置服务器地址, ApiUrl: 'http://192.168.99.86:12010', // 配置服务器地址, - // ParentPage: { // 后续看需求配置 - // CrossDomainProxyUrl: '/Home/CrossDomainProxy', - // BtnsApi: '/api/services/app/Authorization/GetBtns', - // OrgsApi: '/api/services/app/authorization/GetOrgsByUserId' - // }, + ApiWebRtcServerUrl: '127.0.0.1:8000' // 配置视频数据流服务器地址, } \ No newline at end of file diff --git a/src/api/stockTaskLog/index.js b/src/api/stockTaskLog/index.js index 6273ec3..5855d88 100644 --- a/src/api/stockTaskLog/index.js +++ b/src/api/stockTaskLog/index.js @@ -100,4 +100,12 @@ export function add(data) { }) } -export default { del, FetchStopStockBill, FetchInitStockLogList, FetchInitStockLogDetails, FetchProgressByStockBillAndGridCode, FetchInitStockTaskDetails, FetchNewBillNo, FetchStockGirdNum, FetchTotalGirdNum, add } +// 获取目标可盘层架信息 +export function FetchStockGirdSuccess(params) { + return request({ + url: 'api/stocktask-task/getStockGirdSuccess' + '?' + qs.stringify(params, { indices: false }), + method: 'get' + }) +} + +export default { del, FetchStopStockBill, FetchInitStockLogList, FetchInitStockLogDetails, FetchProgressByStockBillAndGridCode, FetchInitStockTaskDetails, FetchNewBillNo, FetchStockGirdNum, FetchTotalGirdNum, add, FetchStockGirdSuccess } diff --git a/src/views/components/hkVideo.vue b/src/views/components/hkVideo.vue index fdc2cab..c261ba4 100644 --- a/src/views/components/hkVideo.vue +++ b/src/views/components/hkVideo.vue @@ -50,9 +50,11 @@ export default { }) }, initVideo() { + 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 - // eslint-disable-next-line no-undef + // 127.0.0.1:8000:启动webrtc-streamer的设备IP和端口,默认8000 + // eslint-disable-next-line no-undef 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 + '/h264/ch1/main/av_stream') diff --git a/src/views/visualCheck/checkManage/checkLog/index.vue b/src/views/visualCheck/checkManage/checkLog/index.vue index 0b5b86e..34c6369 100644 --- a/src/views/visualCheck/checkManage/checkLog/index.vue +++ b/src/views/visualCheck/checkManage/checkLog/index.vue @@ -88,32 +88,80 @@ - + -
- - - - - - - - - - - - - - - - +
+
+ + + - - - +
+
+

注意:系统检查到,有参与本次盘点的摄像头无法连接!仅{{ reachable.length }}/个层架位可盘点。

+ 不可盘点具体情况如下: +
+
+ +
+ 无法连接的摄像头( {{ ipStatusFalseNum }} /个) +
+
+ {{ item.ip }} +
+
+ +
+ 无法盘点的层架位( {{ unreachable.length }} /个) +
+
+ {{ item.gridName }} +
+
+
@@ -204,6 +252,7 @@ {{ scope.row.progress !== null ? scope.row.progress : '-' }} +