From e98da3f66094710d619338f8888985e71ce6d89d Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Fri, 17 May 2024 23:35:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/tree-node/index.vue | 72 ++++++++++ main.js | 4 +- pages.json | 4 + pages/alarmPage/manualCapture/index.vue | 1 + .../projectEnd/projectIndex/projectIndex.vue | 9 +- pages/videoManage/playVideo.vue | 4 +- pages/videoManage/videoGroup.vue | 61 ++++++++ pages/videoManage/videoList.vue | 133 +++++++++++------- 8 files changed, 230 insertions(+), 58 deletions(-) create mode 100644 components/tree-node/index.vue create mode 100644 pages/videoManage/videoGroup.vue diff --git a/components/tree-node/index.vue b/components/tree-node/index.vue new file mode 100644 index 00000000..fcff0383 --- /dev/null +++ b/components/tree-node/index.vue @@ -0,0 +1,72 @@ + + + + + + \ No newline at end of file diff --git a/main.js b/main.js index a722b9a1..f0f913e7 100644 --- a/main.js +++ b/main.js @@ -44,8 +44,8 @@ if (process.env.NODE_ENV === 'development') { // 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' // 工作流线上地址 - Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址 - // Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址 + // Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址 + Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址 // Vue.prototype.work_url = 'http://139.9.66.234:5173' // 工作流地址 // Vue.prototype.work_url = 'http://192.168.34.126:5173' // 工作流地址 // Vue.prototype.url_config = 'http://8.142.139.165:7080/' // 湖里 diff --git a/pages.json b/pages.json index 0bd05d32..14daac70 100644 --- a/pages.json +++ b/pages.json @@ -23,6 +23,10 @@ "path": "pages/videoManage/videoList", "style": {} }, + { + "path": "pages/videoManage/videoGroup", + "style": {} + }, { "path": "pages/videoManage/safeMeeting", "style": {} diff --git a/pages/alarmPage/manualCapture/index.vue b/pages/alarmPage/manualCapture/index.vue index 0f5bffa5..9ac2ec42 100644 --- a/pages/alarmPage/manualCapture/index.vue +++ b/pages/alarmPage/manualCapture/index.vue @@ -296,6 +296,7 @@ let that = this; let data = { projectSn: uni.getStorageSync("dept"), + ignoreDataScope: "ignoreDataScope" }; this.sendRequest({ url: 'xmgl/qualityRegion/notTreeList', diff --git a/pages/projectEnd/projectIndex/projectIndex.vue b/pages/projectEnd/projectIndex/projectIndex.vue index c3c8a35b..444949ec 100644 --- a/pages/projectEnd/projectIndex/projectIndex.vue +++ b/pages/projectEnd/projectIndex/projectIndex.vue @@ -559,10 +559,13 @@ }) break case 'videoMonitor': + // uni.navigateTo({ + // url: '../../videoManage/videoList?sn=' + + // this.projectDetail.projectSn + + // '&pageType=backEnd' + // }) uni.navigateTo({ - url: '../../videoManage/videoList?sn=' + - this.projectDetail.projectSn + - '&pageType=backEnd' + url: '../../videoManage/videoGroup' }) break case 'projectInfo': diff --git a/pages/videoManage/playVideo.vue b/pages/videoManage/playVideo.vue index 2e8be540..6c3227c6 100644 --- a/pages/videoManage/playVideo.vue +++ b/pages/videoManage/playVideo.vue @@ -26,9 +26,9 @@ - + diff --git a/pages/videoManage/videoGroup.vue b/pages/videoManage/videoGroup.vue new file mode 100644 index 00000000..6e8018d6 --- /dev/null +++ b/pages/videoManage/videoGroup.vue @@ -0,0 +1,61 @@ + + + + \ No newline at end of file diff --git a/pages/videoManage/videoList.vue b/pages/videoManage/videoList.vue index 9b565c68..5b780db9 100644 --- a/pages/videoManage/videoList.vue +++ b/pages/videoManage/videoList.vue @@ -13,7 +13,7 @@ - {{item.name}} + {{item.videoName}} @@ -32,81 +32,112 @@ import footers from "../../components/footers/footers.vue" import headers from "../../components/headers/headers.vue" export default { - components:{footers}, + components: { + footers + }, data() { return { - videoList:[], - pageType:'company' + videoList: [], + pageType: 'company', + groupInfo: {}, + projectSn: "" }; }, onLoad(options) { - if(options.pageType){ - this.pageType=options.pageType + if (options.pageType) { + this.pageType = options.pageType } - this.loadData(options.sn) + if (options.obj) { + this.groupInfo = JSON.parse(options.obj) + } + this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn; + this.loadData() }, - methods:{ - playVideoFn(item){ + methods: { + playVideoFn(item) { // console.log(item) - uni.setStorageSync('videoInfo',item) + uni.setStorageSync('videoInfo', item) // if(item.liveRadioUrl){ - uni.navigateTo({ - // url:'./playVideo?url='+item.liveRadioUrl, - url:'playVideo' - }) + uni.navigateTo({ + // url:'./playVideo?url='+item.liveRadioUrl, + url: 'playVideo' + }) // } - + }, - //获取项目视频 + //获取项目分组视频 loadData(sn) { var that = this + let requestData = { + groupId: this.groupInfo.id, + projectSn: this.projectSn, + videoType: 3 + } this.sendRequest({ - url: "xmgl/company/getComapnyStatisticsList", - data: {sn: sn,videoType:1}, + url: "xmgl/videoItem/selectVideoItemListByType", + data: requestData, method: "POST", - success(res){ - console.log('找封面',res) - that.videoList = res.result.videoList + success(res) { + console.log('找封面', res) + that.videoList = res.result } }) }, + // //获取项目视频 + // loadData(sn) { + // var that = this + // this.sendRequest({ + // url: "xmgl/company/getComapnyStatisticsList", + // data: {sn: sn,videoType:1}, + // method: "POST", + // success(res){ + // console.log('找封面',res) + // that.videoList = res.result.videoList + // } + // }) + // }, } } + \ No newline at end of file