From cb2e88eb88a81b8162f30d7bf9916cd1dc58f994 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Fri, 17 May 2024 20:14:19 +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 --- .../js/api/equipmentCenter/cameraList.js | 1 + src/assets/js/http.js | 4 +- .../videoManage/videoConfig.vue | 152 ++++++++++++++++-- 3 files changed, 139 insertions(+), 18 deletions(-) diff --git a/src/assets/js/api/equipmentCenter/cameraList.js b/src/assets/js/api/equipmentCenter/cameraList.js index ee0eaad4..34460fd1 100644 --- a/src/assets/js/api/equipmentCenter/cameraList.js +++ b/src/assets/js/api/equipmentCenter/cameraList.js @@ -32,6 +32,7 @@ export const addVideoGroupApi = data => post('xmgl/videoGroup/add', data); export const deleteVideoGroupApi = data => post('xmgl/videoGroup/delete', data); export const editVideoGroupApi = data => post('xmgl/videoGroup/edit', data); export const getVideoGroupApi = data => post('xmgl/videoGroup/list', data); +export const getVideoTreeGroupApi = data => get('xmgl/videoGroup/tree/list', data); // 上传第三方平台 export const sendVideoInfoApi = data => post('xmgl/videoItem/sendVideoInfo', data); diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 52e35cd5..b7ffe595 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -84,7 +84,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工） // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 - // axios.defaults.baseURL ='http://192.168.34.221:19111/' //郭圣雄本地 + axios.defaults.baseURL ='http://192.168.34.221:19111/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 @@ -96,7 +96,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用) // axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址 // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用) - axios.defaults.baseURL = 'http://42.180.188.17:11211/'//鞍钢测试地址 + // axios.defaults.baseURL = 'http://42.180.188.17:11211/'//鞍钢测试地址 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:19814/'//测试地址 } else if (process.env.NODE_ENV == 'debug') { diff --git a/src/views/equipmentCenter/videoManage/videoConfig.vue b/src/views/equipmentCenter/videoManage/videoConfig.vue index af8b0b34..6c0c77de 100644 --- a/src/views/equipmentCenter/videoManage/videoConfig.vue +++ b/src/views/equipmentCenter/videoManage/videoConfig.vue @@ -36,15 +36,46 @@ {{ $t('message.videoManage.videoGrouping') }}
+ + + {{ + data.groupName + }} + +
+ + +
+ + +
+ +
{{ $t('message.personnelPosition.mapManage.no_data') }}
- + -->
@@ -1024,6 +1057,31 @@ label-width="120px" class="dialogFormBox" > + + + + + + + + + { + console.log('获取视频分组列表', res) + this.videoTreeData = res.result + } + ) + }, //打开配置服务器弹框 accountServerObj() { this.getProjectVideoConfigList() @@ -1677,9 +1776,16 @@ export default { }) }, editGroupFn(item) { + console.log(item,888999) this.isAddGroup = false this.addGroupDialog = true this.addGroupForm = JSON.parse(JSON.stringify(item)) + this.$nextTick(() => { + if (this.addGroupForm.parentId) { + this.selectVal = item.groupName; + this.$refs.groupTree.setCurrentKey(this.addGroupForm.parentId); + } + }); }, deleteGroupFn(item) { // 确定删除分组 @@ -1710,7 +1816,8 @@ export default { if (this.activeGroupIndex === -1) { this.activeGroupIndex = '' } - this.getVideoGroup() + // this.getVideoGroup() + this.getVideoTreeGroup() this.$message.success( this.$t('message.personnelPosition.delete_success') @@ -1722,19 +1829,23 @@ export default { saveGroupFn() { this.$refs['addGroupForm'].validate((valid) => { if (valid) { + let requestData = {...this.addGroupForm} + requestData.parentObj = JSON.stringify(this.selectTreeData); if (this.isAddGroup) { - this.addGroupForm.projectSn = this.$store.state.projectSn - addVideoGroupApi(this.addGroupForm).then((res) => { + requestData.projectSn = this.$store.state.projectSn + addVideoGroupApi(requestData).then((res) => { this.addGroupDialog = false - this.getVideoGroup() + // this.getVideoGroup() + this.getVideoTreeGroup() this.$message.success( this.$t('message.personnelPosition.add_success') ) //添加成功！ }) } else { - editVideoGroupApi(this.addGroupForm).then((res) => { + editVideoGroupApi(requestData).then((res) => { this.addGroupDialog = false - this.getVideoGroup() + // this.getVideoGroup() + this.getVideoTreeGroup() this.$message.success( this.$t('message.personnelPosition.edit_success') ) //编辑成功！ @@ -1833,11 +1944,12 @@ export default { }, //获取视频列表 getVideoList() { - let id = '' - if (this.activeGroupIndex !== '') { - id = this.groupList[parseInt(this.activeGroupIndex)].id - } - console.log(id,77777777) + // let id = '' + // if (this.activeGroupIndex !== '') { + // id = this.groupList[parseInt(this.activeGroupIndex)].id + // } + // console.log(id,77777777) + let id = this.currentGroupInfo.id; this.$nextTick(() => { if (this.videoType === 1) { //萤石云 @@ -2167,6 +2279,14 @@ export default { padding: 10px 0; height: calc(100% - 87px - 20px); position: relative; + .custom-tree-node { + display: flex; + justify-content: space-between; + align-items: center; + width: 90%; + padding-right: 10px; + box-sizing: border-box; + } } .content_data {