diff --git a/main.js b/main.js index 089d8cd3..3de7fed6 100644 --- a/main.js +++ b/main.js @@ -40,8 +40,8 @@ if (process.env.NODE_ENV === 'development') { 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://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址 - // Vue.prototype.url_config = ' http://192.168.34.221:28888/' //郭圣雄本地 - // Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地 + // // Vue.prototype.url_config = ' http://192.168.34.221:28888/' //郭圣雄本地 + 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 2f0accba..8ba5fc59 100644 --- a/pages/videoManage/playBackList.vue +++ b/pages/videoManage/playBackList.vue @@ -7,7 +7,7 @@ - 查询 + 查询 @@ -38,17 +38,7 @@ export default { data() { return { - videoList: [{ - name: 123, - startTime: "2024-05-11 00:00:00", - endTime: "2024-06-11 00:00:00" - }, - { - name: 123, - startTime: "2024-05-11 00:00:00", - endTime: "2024-06-11 00:00:00" - } - ], + videoList: [], pageType: 'company', pageNo: 1, pageSize: 7, @@ -57,11 +47,10 @@ }; }, onLoad(options) { - console.log(options) this.pageSupportData = JSON.parse(options.obj) - console.log(this.pageSupportData) this.pageNo = 1; - this.loadData() + this.timeRange = [dateformat(new Date(),"yyyy-MM-dd"),dateformat(new Date(),"yyyy-MM-dd")] + this.loadData() }, onReachBottom() { // console.log("============================") @@ -72,10 +61,13 @@ this.loadData() }, methods: { + searchData(){ + this.loadData() + }, confirmTimeRange(e, index) { console.log(e, index) this.timeRange = e; - this.loadData(); + // this.loadData(); }, playVideoFn(item) { let passData = { @@ -95,6 +87,7 @@ projectSn: that.pageSupportData.projectSn, serialNumber: that.pageSupportData.serialNumber } + if(!requestData.serialNumber) return; if(this.timeRange && this.timeRange.length > 0){ requestData.beginTime = this.timeRange[0] requestData.endTime = this.timeRange[1] @@ -105,11 +98,15 @@ method: "POST", success(res) { console.log('找封面', res) - that.videoList = res.result.list - that.videoList.map(item => { - item.beginTime = dateformat(item.beginTime); - item.endTime = dateformat(item.endTime); - }) + if(res.result.list){ + that.videoList = res.result.list + that.videoList.map(item => { + item.beginTime = dateformat(item.beginTime); + item.endTime = dateformat(item.endTime); + }) + } else { + that.videoList = [] + } } }) }, diff --git a/pages/videoManage/videoGroup.vue b/pages/videoManage/videoGroup.vue index 6e8018d6..9f6c27bd 100644 --- a/pages/videoManage/videoGroup.vue +++ b/pages/videoManage/videoGroup.vue @@ -57,5 +57,13 @@ .main-content { background: #F4F5FD; height: 100vh; + .content-part{ + .tree-content-compontent:nth-child(2n -1){ + background: #F5F5F5; + } + .tree-content-compontent:nth-child(2n){ + background: #FFFFFF; + } + } } \ No newline at end of file