diff --git a/main.js b/main.js index 9e9d6403..5cbd1e2a 100644 --- a/main.js +++ b/main.js @@ -38,9 +38,9 @@ if (process.env.NODE_ENV === 'development') { // Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢正式地址(弃用) // Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢正式地址 // Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢测试地址 - Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址 + // Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址 // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址 - // Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地 + Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地 // Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地 // Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址(弃用) // Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址 diff --git a/pages/videoManage/playBackList.vue b/pages/videoManage/playBackList.vue index 11b919f0..2b60edec 100644 --- a/pages/videoManage/playBackList.vue +++ b/pages/videoManage/playBackList.vue @@ -49,16 +49,16 @@ pageType: 'company', pageNo: 1, pageSize: 7, - timeRange: [] + timeRange: [], + pageSupportData: {} }; }, onLoad(options) { console.log(options) - if (options.pageType) { - this.pageType = options.pageType - } - // this.loadData(options.sn) + this.pageSupportData = JSON.parse(options.obj) + console.log(this.pageSupportData) this.pageNo = 1; + this.loadData() }, onReachBottom() { // console.log("============================") @@ -66,14 +66,13 @@ uni.showLoading({ title: '加载中' }) - // this.loadData() + this.loadData() }, methods: { confirmTimeRange(e, index) { console.log(e, index) - // this.form.plannedMakeBeamBeginTime = e[0] - // this.form.plannedMakeBeamEndTime = e[1] - // console.log("制梁时间选择", e) + this.timeRange = e; + this.loadData(); }, playVideoFn(item) { uni.navigateTo({ @@ -81,17 +80,20 @@ }) }, //获取项目视频 - loadData(sn) { + loadData() { var that = this + console.log(this.timeRange,777888) + let requestData = { + projectSn: that.pageSupportData.projectSn, + serialNumber: that.pageSupportData.serialNumber + } + if(this.timeRange && this.timeRange.length > 0){ + requestData.beginTime = this.timeRange[0] + requestData.endTime = this.timeRange[1] + } this.sendRequest({ url: "xmgl/videoItem/callPostPlaybackURLsV2", - data: { - projectSn: sn, - projectSn: "BD3137498CB84BF0969979E0342CDBCA", - serialNumber: "0f74ac52cf0e40af84be654242b55ac7", - beginTime: "2024-05-16 00:00:00", - endTime: "2024-05-16 17:00:00" - }, + data: requestData, method: "POST", success(res) { console.log('找封面', res) diff --git a/pages/videoManage/playVideo.vue b/pages/videoManage/playVideo.vue index 664cb00f..2e8be540 100644 --- a/pages/videoManage/playVideo.vue +++ b/pages/videoManage/playVideo.vue @@ -7,7 +7,7 @@ - + {{videoInfo.videoName}} @@ -41,6 +41,7 @@ url:'',//rtsp://admin:jxj12345@192.168.0.64:554/h264/ch1/main/av_stream videoInfo:{videoName:'',videoType:null}, streamType: 1, //1是子码流 2是主码流 + videoResponseInfo: {} }; }, onLoad(options) { @@ -53,11 +54,16 @@ this.getPlayUrl() } }, + computed: { + playUrlFilter(){ + return this.url?'rtsp://42.180.188.17:'+this.url.substring(20):"" + } + }, methods:{ // 跳转到录像回放列表 toBackList(){ uni.navigateTo({ - url: './playBackList' + url: './playBackList?obj=' + JSON.stringify(this.videoResponseInfo) }) }, changeStreamFn(){ @@ -88,6 +94,12 @@ that.url=res.result.videoInfo.url break; } + that.videoResponseInfo = {...res.result.projectVideoConfig,...res.result.videoInfo}; + for(let i in that.videoResponseInfo){ + if(!that.videoResponseInfo[i]){ + delete that.videoResponseInfo[i] + } + } } }) },