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 | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/views/layerManagement/components/leftList.vue b/src/views/layerManagement/components/leftList.vue
index 533a188..20e4163 100644
--- a/src/views/layerManagement/components/leftList.vue
+++ b/src/views/layerManagement/components/leftList.vue
@@ -57,7 +57,7 @@
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"
@@ -78,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>
@@ -125,7 +125,7 @@
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 = [];
@@ -197,7 +197,7 @@
checkedNodes.value = allFenceNodes;
coverData.value = allFenceNodes;
emit('update:coverData', coverData.value);
-
+
}
}
@@ -228,10 +228,10 @@
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;
@@ -265,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);
}
@@ -301,7 +301,7 @@
}
})
.catch(() => {
- ElMessage.warning('已取消删除');
+
});
};
// 新增围栏
@@ -397,10 +397,10 @@
() => props.resetCheck,
(newVal) => {
if (newVal !== undefined) {
- checkedKeys.value = [];
- checkedNodes.value = [];
- coverData.value = [];
- treeRef.value?.setCheckedKeys([]);
+ checkedKeys.value = [];
+ checkedNodes.value = [];
+ coverData.value = [];
+ treeRef.value?.setCheckedKeys([]);
}
},
{ immediate: true }
@@ -500,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