From b5e2aaaba43d7456ab6ffedefa16c97a22cbe479 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 21 Nov 2025 18:40:01 +0800
Subject: [PATCH] Merge branch 'feature/v8.0/8.0.2' into prod
---
src/views/job/components/SearchBox.vue | 84 +++++++++++++++++++++++++----------------
1 files changed, 51 insertions(+), 33 deletions(-)
diff --git a/src/views/job/components/SearchBox.vue b/src/views/job/components/SearchBox.vue
index d69206c..6f6e0af 100644
--- a/src/views/job/components/SearchBox.vue
+++ b/src/views/job/components/SearchBox.vue
@@ -94,21 +94,19 @@
@clear="handleClear"
/>
</el-form-item>
- <!-- <el-form-item label="所属部门:" v-if="isExpand">
- <el-select
- :teleported="false"
+ <el-form-item label="所属部门:" v-if="isExpand">
+ <el-tree-select
+ popper-class="custom-tree-select"
v-model="searchForm.create_dept"
- placeholder="请选择"
+ :data="deptData"
+ :default-expanded-keys="[searchForm.create_dept]"
+ check-strictly
+ node-key="id"
+ :props="treeDeptProps"
clearable
- >
- <el-option
- v-for="item in deptData"
- :key="item.id"
- :label="item.deptName"
- :value="item.id"
- />
- </el-select>
- </el-form-item> -->
+ @change="(id) => handleDeptNodeClick({id})"
+ />
+ </el-form-item>
<el-form-item label="任务状态:" v-if="isExpand">
<el-select
style="z-index: 1000"
@@ -149,6 +147,7 @@
import { pxToRem } from '@/utils/rem';
import { ElMessage } from 'element-plus';
import { deptsByAreaCode, getSFDictionaryTree } from '@/api/job/task';
+import { getDeptLazyTree } from '@/api/system/dept'
// import TaskAlgorithmBusiness from './TaskAlgorithmBusiness.vue';
import dayjs from 'dayjs';
import { useStore } from 'vuex';
@@ -213,10 +212,8 @@
let deptData = ref([]);
// 所属部门信息
const getDeptsByAreaCode = () => {
- deptsByAreaCode(searchForm.area_code).then(res => {
- if (res.code !== 0) {
- deptData.value = res.data.data;
- }
+ getDeptLazyTree({ parentId: 0, level: 0 }).then(res => {
+ deptData.value = res.data.data;
});
};
@@ -225,20 +222,43 @@
// 机巢
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 = {
label: 'dictValue',
value: 'id',
children: 'children',
+}
+// 部门
+const treeDeptProps = {
+ label: 'title',
+ value: 'id',
+ children: 'children',
}
const dictKey = ref('')
const dataList = ref([])
@@ -280,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'];
@@ -359,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();
};
// 新增任务
@@ -416,6 +433,7 @@
onMounted(() => {
requestDockInfo();
+ getDeptsByAreaCode()
getAlgorithmList();
// 日历传值
const calendarday = ref(route.query.day);
--
Gitblit v1.9.3