admin/zhgdyunapp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev

Browse Source
This commit is contained in:
Vce 2024-05-18 22:09:42 +08:00
commit bbe0547499
3 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main.js
View File

@ -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://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://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址
// Vue.prototype.url_config = ' http://192.168.34.221:28888/' //郭圣雄本地 // // 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:9111/' //郭圣雄本地
// Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地 // 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://47.93.215.234:19997' // 工作流线上地址（弃用）
// Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址 // Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址

39
pages/videoManage/playBackList.vue
View File

@ -7,7 +7,7 @@
</headers> </headers>
<view class="date-search"> <view class="date-search">
<uni-datetime-picker v-model="timeRange" type="daterange" rangeSeparator="至" @change="confirmTimeRange" /> <uni-datetime-picker v-model="timeRange" type="daterange" rangeSeparator="至" @change="confirmTimeRange" />
<view class="btn-style">查询</view> <view class="btn-style" @click="searchData">查询</view>
</view> </view>
<view class="videoBox" v-if="videoList.length>0"> <view class="videoBox" v-if="videoList.length>0">
<view class="videoItem" v-for="(item,index) in videoList" :key="index" @click="playVideoFn(item)"> <view class="videoItem" v-for="(item,index) in videoList" :key="index" @click="playVideoFn(item)">
@ -38,17 +38,7 @@
export default { export default {
data() { data() {
return { return {
videoList: [{ 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"
}
],
pageType: 'company', pageType: 'company',
pageNo: 1, pageNo: 1,
pageSize: 7, pageSize: 7,
@ -57,11 +47,10 @@
}; };
}, },
onLoad(options) { onLoad(options) {
console.log(options)
this.pageSupportData = JSON.parse(options.obj) this.pageSupportData = JSON.parse(options.obj)
console.log(this.pageSupportData)
this.pageNo = 1; this.pageNo = 1;
this.loadData() this.timeRange = [dateformat(new Date(),"yyyy-MM-dd"),dateformat(new Date(),"yyyy-MM-dd")]
this.loadData()
}, },
onReachBottom() { onReachBottom() {
// console.log("============================") // console.log("============================")
@ -72,10 +61,13 @@
this.loadData() this.loadData()
}, },
methods: { methods: {
searchData(){
this.loadData()
},
confirmTimeRange(e, index) { confirmTimeRange(e, index) {
console.log(e, index) console.log(e, index)
this.timeRange = e; this.timeRange = e;
this.loadData(); // this.loadData();
}, },
playVideoFn(item) { playVideoFn(item) {
let passData = { let passData = {
@ -95,6 +87,7 @@
projectSn: that.pageSupportData.projectSn, projectSn: that.pageSupportData.projectSn,
serialNumber: that.pageSupportData.serialNumber serialNumber: that.pageSupportData.serialNumber
} }
if(!requestData.serialNumber) return;
if(this.timeRange && this.timeRange.length > 0){ if(this.timeRange && this.timeRange.length > 0){
requestData.beginTime = this.timeRange[0] requestData.beginTime = this.timeRange[0]
requestData.endTime = this.timeRange[1] requestData.endTime = this.timeRange[1]
@ -105,11 +98,15 @@
method: "POST", method: "POST",
success(res) { success(res) {
console.log('找封面', res) console.log('找封面', res)
that.videoList = res.result.list if(res.result.list){
that.videoList.map(item => { that.videoList = res.result.list
item.beginTime = dateformat(item.beginTime); that.videoList.map(item => {
item.endTime = dateformat(item.endTime); item.beginTime = dateformat(item.beginTime);
}) item.endTime = dateformat(item.endTime);
})
} else {
that.videoList = []
}
} }
}) })
}, },

8
pages/videoManage/videoGroup.vue
View File

@ -57,5 +57,13 @@
.main-content { .main-content {
background: #F4F5FD; background: #F4F5FD;
height: 100vh; height: 100vh;
.content-part{
.tree-content-compontent:nth-child(2n -1){
background: #F5F5F5;
}
.tree-content-compontent:nth-child(2n){
background: #FFFFFF;
}
}
} }
</style> </style>