Browse Source

配合需求更新优化

master
xuhuajiao 1 week ago
parent
commit
dc12917ffa
  1. 1
      public/index.html
  2. 2
      public/static/config.js
  3. 13
      src/api/asset/index.js
  4. 2
      src/views/components/hkVideo.vue

1
public/index.html

@ -8,6 +8,7 @@
<link rel="icon" href="<%= BASE_URL %>favicon.svg" type="image/svg+xml">
<script src="/static/adapter.min.js"></script>
<script src="/static/webrtcstreamer.js"></script>
<script type="text/javascript" src="/static/gs_label_c_sdk_2.0.0.js"></script>
<title><%= webpackConfig.name %></title>
<script type="text/javascript" src="/static/config.js"></script>
</head>

2
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', // 配置监控视频服务器地址
}

13
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
}

2
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,rtspH264
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)

Loading…
Cancel
Save