From 81ade4bd74d304b8cdd23f84bdafde3523235cf8 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Sat, 16 Mar 2024 19:01:31 +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 --- .../videoManage/cameraList.vue | 2 +- .../videoManage/videoConfig.vue | 20 ++++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/views/equipmentCenter/videoManage/cameraList.vue b/src/views/equipmentCenter/videoManage/cameraList.vue index 0e2431b0..806d59ef 100644 --- a/src/views/equipmentCenter/videoManage/cameraList.vue +++ b/src/views/equipmentCenter/videoManage/cameraList.vue @@ -368,7 +368,7 @@ export default { this.videoInfo.groupId = id selectVideoItemListByTypeApi(this.videoInfo).then((result) => { console.log('result=========数据',result); - if (result.success) { + if (result.success && result.result) { this.cameraList = result.result console.log('videoInfo', this.videoInfo, '视频列表', this.cameraList) } diff --git a/src/views/equipmentCenter/videoManage/videoConfig.vue b/src/views/equipmentCenter/videoManage/videoConfig.vue index 61842273..fcede1c5 100644 --- a/src/views/equipmentCenter/videoManage/videoConfig.vue +++ b/src/views/equipmentCenter/videoManage/videoConfig.vue @@ -37,14 +37,14 @@
-
- + 全部 {{ $t('message.videoManage.whole') }} -
+
-->
- {{ $t('message.videoManage.dialog_newVideo.operation.add') }} @@ -1259,7 +1259,7 @@ export default { organizationID: '', groupList: [], nvrList: [], - activeGroupIndex: '', + activeGroupIndex: 0, currentGroupInfo: null, isAddGroup: true, addGroupDialog: false, @@ -1346,9 +1346,8 @@ export default { }, created() { this.projectSn = this.$store.state.projectSn - this.getProjectVideoConfigList() - this.getAccountList() this.getVideoGroup() + this.getAccountList() this.getAll() }, components: { cameraList, cameraListLc, gdMap }, @@ -1727,6 +1726,10 @@ export default { (res) => { console.log('获取视频分组列表', res) this.groupList = res.result + if(this.groupList.length > 0){ + this.currentGroupInfo = this.groupList[0] + this.getProjectVideoConfigList() + } } ) }, @@ -1802,6 +1805,7 @@ export default { if (this.activeGroupIndex !== '') { id = this.groupList[parseInt(this.activeGroupIndex)].id } + console.log(id,77777777) this.$nextTick(() => { if (this.videoType === 1) { //萤石云 @@ -1848,6 +1852,7 @@ export default { if (this.videoType === 1) { //萤石云 this.$refs.camera.setVideoInfo(res.result) + this.$refs.camera.getSelectVideoItemListByTypeApi(this.currentGroupInfo.id); } if ( this.videoType === 2 || @@ -1856,6 +1861,7 @@ export default { ) { //乐橙云、isc 、xiongmai this.$refs.cameralc.setVideoInfo(res.result) + this.$refs.cameralc.getSelectVideoItemListByTypeApi(this.currentGroupInfo.id); } }) }