diff --git a/src/assets/js/api/dangerousBigProject.js b/src/assets/js/api/dangerousBigProject.js index c2bf03bc..29ecd234 100644 --- a/src/assets/js/api/dangerousBigProject.js +++ b/src/assets/js/api/dangerousBigProject.js @@ -180,4 +180,7 @@ export const getBigDangerRecognizeDetailPageApi = data => get('xmgl/bigDangerRec // 保存分类下的危大清单辨识详情信息 export const saveByTypeBigDangerRecognizeDetailApi = data => post('xmgl/bigDangerRecognizeDetail/saveByType', data); // 删除危大清单辨识详情信息 -export const deleteBigDangerRecognizeDetailApi = data => post('xmgl/bigDangerRecognizeDetail/delete', data); \ No newline at end of file +export const deleteBigDangerRecognizeDetailApi = data => post('xmgl/bigDangerRecognizeDetail/delete', data); + +// 列表查询危大工程类别信息 +export const getBigDangerTypeListApi = data => post('xmgl/bigDangerType/list', data); \ No newline at end of file diff --git a/src/views/equipmentCenter/videoManage/videoConfig.vue b/src/views/equipmentCenter/videoManage/videoConfig.vue index 4a13f423..c0ac3ec3 100644 --- a/src/views/equipmentCenter/videoManage/videoConfig.vue +++ b/src/views/equipmentCenter/videoManage/videoConfig.vue @@ -2237,12 +2237,31 @@ export default { this.addGroupDialog = true; this.addGroupForm = JSON.parse(JSON.stringify(item)); this.$nextTick(() => { - if (this.addGroupForm.parentObj) { - this.selectVal = JSON.parse(this.addGroupForm.parentObj).groupName; + const find = this.findNodeById(this.videoTreeData, item.parentId); + if(find) { + this.selectVal = find.groupName; this.$refs.groupTree.setCurrentKey(this.addGroupForm.parentId); } + // if (this.addGroupForm.parentObj) { + // this.selectVal = JSON.parse(this.addGroupForm.parentObj).groupName; + // this.$refs.groupTree.setCurrentKey(this.addGroupForm.parentId); + // } }); }, + findNodeById(node, id) { + const find = node.find((item) => item.id === id); + if (find) { + return find; + } + for (let child of node) { + if (child.children && child.children.length > 0) { + const found = this.findNodeById(child.children, id); + if (found) return found; + } + } + + return null; + }, deleteGroupFn(item) { // 确定删除分组 this.$confirm( @@ -2607,17 +2626,23 @@ export default { ? obj.enterpriseIds.split(",") : []; this.$nextTick(() => { - if (this.currentVideoTypeDetail.parentObj) { - this.selectFormVal = JSON.parse( - this.currentVideoTypeDetail.parentObj - ).groupName; - this.selectFormTreeData = JSON.parse( - this.currentVideoTypeDetail.parentObj - ); - this.$refs.groupFormTree.setCurrentKey( - this.currentVideoTypeDetail.parentId - ); + const find = this.findNodeById(this.videoTreeData, obj.groupId); + if(find) { + this.selectFormVal = find.groupName; + this.$refs.groupTree.setCurrentKey(this.currentVideoTypeDetail.groupId); } + + // if (this.currentVideoTypeDetail.parentObj) { + // this.selectFormVal = JSON.parse( + // this.currentVideoTypeDetail.parentObj + // ).groupName; + // this.selectFormTreeData = JSON.parse( + // this.currentVideoTypeDetail.parentObj + // ); + // this.$refs.groupFormTree.setCurrentKey( + // this.currentVideoTypeDetail.parentId + // ); + // } }); console.log("编辑内容", obj); }, diff --git a/src/views/projectFront/dangerousBigProject/newCheckTable/components/identificationRecord.vue b/src/views/projectFront/dangerousBigProject/newCheckTable/components/identificationRecord.vue index 7eade47b..42f9ed21 100644 --- a/src/views/projectFront/dangerousBigProject/newCheckTable/components/identificationRecord.vue +++ b/src/views/projectFront/dangerousBigProject/newCheckTable/components/identificationRecord.vue @@ -78,8 +78,8 @@ style="width: 100%" row-key="id" class="tables" - height="calc(100% - 64px - 56px - 16px)" - max-height="calc(100% - 64px - 116px - 16px)" + height="calc(100% - 64px - 56px)" + max-height="calc(100% - 64px - 56px)" > 危大工程辨识

- + 保存
@@ -24,13 +29,16 @@
全部 - 已辨识出危大工程({{ 0 }})已辨识出危大工程({{ + riskListDetailInfo.recognizedBigDangerNum || 0 + }})
@@ -41,13 +49,17 @@ :inline="true" > - + - - +