From 5808f76456ca0d40de5074f132b73a5a488e3e13 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Tue, 09 Dec 2025 09:12:03 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v9.0/9.0.1' into test
---
src/views/layerManagement/components/leftList.vue | 119 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 64 insertions(+), 55 deletions(-)
diff --git a/src/views/layerManagement/components/leftList.vue b/src/views/layerManagement/components/leftList.vue
index 2ce3a5a..20e4163 100644
--- a/src/views/layerManagement/components/leftList.vue
+++ b/src/views/layerManagement/components/leftList.vue
@@ -44,7 +44,7 @@
<div
class="tableListBox"
v-loading="loading"
- element-loading-background="rgba(0, 0, 0, 0.5)"
+ element-loading-background="rgba(0, 0, 0, 0.2)"
element-loading-text="加载中..."
>
<el-tree
@@ -57,8 +57,9 @@
node-key="id"
default-expand-all
:expand-on-click-node="false"
- :check-on-click-node="false"
+ :check-on-click-node="false"
:filter-node-method="filterNode"
+ highlight-current
@check="handleCheck"
:props="{
label: 'name',
@@ -77,7 +78,7 @@
icon="el-icon-location"
@click.stop="handleLocation(node)"
:disabled="node.data.level === 2 && (!node.data.children || node.data.children.length === 0)"
- class="location-btn"
+ class="location-btn"
></el-button>
<el-button icon="el-icon-edit" link @click.stop="handleEdit(node)"></el-button>
<el-button icon="el-icon-delete" link @click.stop="handleDelete(node)"></el-button>
@@ -108,7 +109,7 @@
const checkedKeys = ref([]); // 存储勾选的节点key
const treeRef = ref(null); // 获取tree实例
const checkedNodes = ref([]); // 存储勾选的节点数据
-const props = defineProps(['activeName']);
+const props = defineProps(['activeName','resetCheck']);
const formData = ref({
isPush: undefined,
page: 1,
@@ -124,9 +125,19 @@
const gettreeDataApi = async () => {
try {
loading.value = true;
- const res = await treeDataApi();
+ const res = await treeDataApi({filterExpired:false});
treeAllData.value = res.data.data;
-
+ if(coverData.value.length===0){
+ checkedKeys.value = [];
+ checkedNodes.value = [];
+ coverData.value = [];
+ nextTick(() => {
+ if (treeRef.value) {
+ treeRef.value.setCheckedKeys([]);
+ }
+ });
+ }
+
setupWatch();
} catch (error) {
console.error('获取数据失败:', error);
@@ -167,31 +178,38 @@
);
};
const selectAll = () => {
+ layerParams.value.currentLocationFolderId = null;
layerParams.value.isSingleLocating = false
if (treeRef.value) {
const allFenceKeys = getAllFenceKeys();
const allFenceNodes = treeData.value.flatMap(folder => folder.children);
-
if (checkedKeys.value.length === allFenceKeys.length) {
// 取消全选
treeRef.value.setCheckedKeys([]);
checkedKeys.value = [];
checkedNodes.value = [];
coverData.value = [];
+ emit('update:coverData', coverData.value);
} else {
// 全选
treeRef.value.setCheckedKeys(allFenceKeys);
checkedKeys.value = allFenceKeys;
checkedNodes.value = allFenceNodes;
coverData.value = allFenceNodes;
+ emit('update:coverData', coverData.value);
+
}
- emit('update:coverData', coverData.value);
+
}
};
// 定位按钮事件
const handleLocation = node => {
-console.log('11',node.data);
-
+ const currentKey = treeRef.value.getCurrentKey();
+ if (currentKey === node.data.id) {
+ treeRef.value.setCurrentKey(null); // 取消高亮
+ } else {
+ treeRef.value.setCurrentKey(node.data.id); // 高亮当前节点
+ }
if (node.data.level === 2) {
layerParams.value.isSingleLocating = false;
// 新增：标记当前定位的文件夹ID
@@ -205,16 +223,15 @@
const currentCheckedKeys = [...checkedKeys.value];
const currentCheckedNodes = [...checkedNodes.value];
EventBus.emit('focusOnNode', node.data);
-
if (node.data.level === 2) {
const folderChildren = node.data.children || [];
const childrenIds = folderChildren.map(child => child.id);
const newChildrenIds = childrenIds.filter(id => !currentCheckedKeys.includes(id));
const newChildrenNodes = folderChildren.filter(child => newChildrenIds.includes(child.id));
-
+
const newCheckedKeys = [...new Set([...currentCheckedKeys, ...newChildrenIds])];
const newCheckedNodes = [...currentCheckedNodes, ...newChildrenNodes];
-
+
treeRef.value.setCheckedKeys(newCheckedKeys);
checkedKeys.value = newCheckedKeys;
checkedNodes.value = newCheckedNodes;
@@ -248,10 +265,10 @@
coverData.value = [];
layerParams.value.editNest = true;
layerParams.value.decideWhetherToAddOrEdit = 2;
- if (props.activeName === '自定义识别区') {
+ if (props.activeName === '自定义识别区') {
layerParams.value.fenceType = 1; // 电子围栏类型标识
} else if (props.activeName === '自定义禁飞区') {
- layerParams.value.fenceType = 2; // 自定义禁飞区类型标识
+ layerParams.value.fenceType = 2; // 自定义禁飞区类型标识
}
emit('update:deitData', node.data);
}
@@ -259,6 +276,7 @@
// 删除按钮事件
const handleDelete = node => {
+
let id = node.data.id;
ElMessageBox.confirm('确定要删除该内容吗？', '提示', {
confirmButtonText: '确定',
@@ -283,7 +301,7 @@
}
})
.catch(() => {
- ElMessage.warning('已取消删除');
+
});
};
// 新增围栏
@@ -374,7 +392,19 @@
ElMessage.success('取消同步成功');
});
}
-
+// 切换tab清空复选框的数据
+watch(
+ () => props.resetCheck,
+ (newVal) => {
+ if (newVal !== undefined) {
+ checkedKeys.value = [];
+ checkedNodes.value = [];
+ coverData.value = [];
+ treeRef.value?.setCheckedKeys([]);
+ }
+ },
+ { immediate: true }
+);
onMounted(() => {
failuresList();
gettreeDataApi();
@@ -392,7 +422,7 @@
left: 0;
height: calc(100% - 32px);
z-index: 99;
- width: 382px;
+ width: 332px;
overflow: hidden;
background: rgba(0,0,0,0.51);
backdrop-filter: blur(4px);
@@ -407,7 +437,7 @@
margin-top: 10px;
padding-right: 12px;
.inputName {
- width: 184px;
+ width: 140px;
height: 32px;
}
.searchAndReset {
@@ -416,34 +446,7 @@
justify-content: right;
align-items: center;
margin-right: 10px;
- .reset,
- .search {
- display: flex;
- align-items: center;
- justify-content: center;
- width: 46px;
- height: 32px;
- cursor: pointer;
- }
- .reset {
- margin-left: 12px;
- background: #0d2b38;
- border-radius: 4px 4px 4px 4px;
- border: 1px solid #84cbd3;
- font-weight: 400;
- font-size: 14px;
- color: #ffffff;
- }
-
- .search {
- background: #1e2d51;
- border-radius: 4px 4px 4px 4px;
- border: 1px solid #c5d6ff;
- font-weight: 400;
- font-size: 14px;
- color: #ffffff;
- }
}
}
.btnGroups {
@@ -459,12 +462,17 @@
overflow-y: scroll;
height: 0;
flex-grow: 1;
- padding-right: 12px;
+ // padding-right: 12px;
:deep(.el-tree-node__content) {
- height: 35px !important;
- line-height: 35px !important;
+ height: 45px !important;
+ line-height: 45px !important;
+ // padding-left: 0 !important;
+ border-bottom: 1px dotted rgba(255,255,255,0.1);
}
-
+ // 定位选中节点的背景色样式
+ ::v-deep(.el-tree-node.is-current > .el-tree-node__content) {
+ background-color: rgba(64, 158, 255, 0.2) !important; // 浅蓝色半透明背景
+ }
.isTheTerritory {
:deep() {
.el-tree-node__expand-icon {
@@ -482,6 +490,7 @@
display: flex;
justify-content: space-between;
align-items: center;
+ padding-right: 12px;
width: 100%;
.nodeName {
font-size: 12px !important;
@@ -491,20 +500,20 @@
.tree-node-actions {
display: flex;
// gap: 8px;
-
+
button {
- padding: 0;
- color: #fff;
+ padding: 0;
+ color: #fff;
width: 17px;
height: 17px;
// color: #409eff;
// &:hover {
- // color: #409eff;
+ // color: #409eff;
// }
}
}
::v-deep(.location-btn.el-button.is-link.is-disabled) {
- color: #999 !important;
+ color: #999 !important;
}
}
</style>
--
Gitblit v1.9.3