From 4eb25a704901c9f08033e9e6aa05641536673e32 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 17 Nov 2025 15:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature/v8.0/8.0.2' into feature/v8.0/8.0.2
---
src/views/job/components/SearchBox.vue | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/src/views/job/components/SearchBox.vue b/src/views/job/components/SearchBox.vue
index b3a443b..6f6e0af 100644
--- a/src/views/job/components/SearchBox.vue
+++ b/src/views/job/components/SearchBox.vue
@@ -104,6 +104,7 @@
node-key="id"
:props="treeDeptProps"
clearable
+ @change="(id) => handleDeptNodeClick({id})"
/>
</el-form-item>
<el-form-item label="任务状态:" v-if="isExpand">
@@ -221,14 +222,31 @@
// 机巢
let machineData = ref([]);
+// 记录选中行政区划值
+let area_code_log = ref('')
+// 记录选中部门
+let dept_id_log = ref('')
+
// 部门下得机巢
const requestDockInfo = () => {
getRegionTreeAll({ parentCode: userAreaCode.value }).then(res => {
deptTreeData.value = res.data.data ? [res.data.data] : [];
- handleNodeClick({ id: userAreaCode.value });
+ area_code_log.value = userAreaCode.value
+ roadDroneList()
});
};
+
+function handleNodeClick(data) {
+ area_code_log.value = data?.id
+ roadDroneList()
+}
+
+// 筛选部门管理
+function handleDeptNodeClick(data) {
+ dept_id_log.value = data.id
+ roadDroneList()
+}
// 算法
const treePropsSF = {
@@ -282,24 +300,19 @@
handleSearch()
}
-const handleNodeClick = async data => {
+async function roadDroneList() {
// 处理机巢数据
- searchForm.device_sn = '';
- machineData.value = '';
+ searchForm.device_sn = ''
+ machineData.value = ''
+ const droneList = await getDeviceRegion({ area_code: area_code_log.value, dept_id: dept_id_log.value })
- const droneList = await getDeviceRegion({ areaCode: data.id });
-
- machineData.value = droneList?.data?.data;
+ machineData.value = droneList?.data?.data
// 默认选中值
if (signDevice_sn.value) {
- searchForm.device_sn = signDevice_sn.value;
+ searchForm.device_sn = signDevice_sn.value
}
- // 所属部门重新请求值
- // searchForm.create_dept = '';
- // deptData.value = [];
- // getDeptsByAreaCode();
- handleSearch();
-};
+ handleSearch()
+}
// 日期 和周期
let timeList = ['today', 'week', 'month', 'year'];
@@ -361,8 +374,10 @@
// 清除算法
dictKey.value = '';
// algorithmRef.value?.clear()
- handleNodeClick({ id: userAreaCode.value });
- handleSearch();
+ area_code_log.value = userAreaCode.value
+ dept_id_log.value = ''
+ roadDroneList()
+ // handleSearch();
};
// 新增任务
--
Gitblit v1.9.3