diff --git a/public/index.html b/public/index.html
index f0eb69e..4dd9e69 100644
--- a/public/index.html
+++ b/public/index.html
@@ -8,6 +8,7 @@
+
<%= webpackConfig.name %>
diff --git a/public/static/config.js b/public/static/config.js
index 3043a9f..704490b 100644
--- a/public/static/config.js
+++ b/public/static/config.js
@@ -1,5 +1,5 @@
window.g = {
AXIOS_TIMEOUT: 10000,
ApiUrl: 'http://172.17.162.10:15000', // 配置服务器地址
- ApiWebRtcServerUrl: '127.0.0.1:8000', // 配置监控视频服务器地址
+ ApiWebRtcServerUrl: '172.17.162.10:8000', // 配置监控视频服务器地址
}
\ No newline at end of file
diff --git a/src/api/asset/index.js b/src/api/asset/index.js
index 9ec0b38..fdb0fe7 100644
--- a/src/api/asset/index.js
+++ b/src/api/asset/index.js
@@ -78,6 +78,16 @@ export function FetchInOutDetailsByBillNo(params) {
params
})
}
+
+// 初始化盘点单
+export function FetchInitStockTakeBill(params) {
+ return request({
+ url: 'api/stocktake/initStockTakeBill',
+ method: 'get',
+ params
+ })
+}
+
export default {
FetchInitAssetInfo,
add,
@@ -87,5 +97,6 @@ export default {
FetchStockSettle,
FetchDeleteStockTake,
FetchDeleteAssetInfoPhotoById,
- FetchInOutDetailsByBillNo
+ FetchInOutDetailsByBillNo,
+ FetchInitStockTakeBill
}
diff --git a/src/views/components/hkVideo.vue b/src/views/components/hkVideo.vue
index 27aa216..36979e0 100644
--- a/src/views/components/hkVideo.vue
+++ b/src/views/components/hkVideo.vue
@@ -58,7 +58,7 @@ export default {
// 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')
+ this.webRtcServer.connect('rtsp://' + this.hkConfig.username + ':' + this.hkConfig.devicePassword + '@' + this.hkConfig.ip + ':' + this.hkConfig.port + '/h264/ch1/main/av_stream')
// 测试用
// this.webRtcServer.connect('rtsp://admin:ftzn83560792@192.168.99.120:554/h264/1/1')
// this.webRtcServer.connect(rtsp_url)