From 25ff7cbac4d8db9692ab63c7d24a2ededa0c8921 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 17 Apr 2025 13:21:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/TaskManage/SearchBox.vue | 62 +++++++++++++++++--------------
1 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/src/views/TaskManage/SearchBox.vue b/src/views/TaskManage/SearchBox.vue
index a68978c..ceef403 100644
--- a/src/views/TaskManage/SearchBox.vue
+++ b/src/views/TaskManage/SearchBox.vue
@@ -40,7 +40,7 @@
</div>
</el-form-item>
<el-form-item label="任务算法:" v-if="isExpand">
- <TaskAlgorithmBusiness :setWidth="200" :showAlgorithm="true" @algorithmChange="algorithmChange"/>
+ <TaskAlgorithmBusiness :setWidth="186" :showAlgorithm="true" @algorithmChange="algorithmChange"/>
</el-form-item>
<el-form-item label="所属部门:" v-if="isExpand">
<el-select class="ztzf-select" v-model="searchForm.create_dept" placeholder="请选择部门" clearable>
@@ -53,7 +53,7 @@
</el-select>
</el-form-item>
<el-form-item label="任务类型:" v-if="isExpand">
- <TaskAlgorithmBusiness :setWidth="200" :showBusiness="true" @businessChange="businessChange"/>
+ <TaskAlgorithmBusiness :setWidth="186" :showBusiness="true" @businessChange="businessChange"/>
</el-form-item>
<div class="more" v-if="isExpand" @click="toggleExpand">收起</div>
<div class="more" v-else @click="toggleExpand">更多</div>
@@ -84,7 +84,7 @@
ai_types: [], // 算法类型
area_code: '', // 区域code
create_dept: '', // 创建部门
- date_enum: '', // 日期枚举,可用值:TODAY,CURRENT_WEEK,CURRENT_MONTH,CURRENT_YEAR
+ date_enum: 'TODAY', // 日期枚举,可用值:TODAY,CURRENT_WEEK,CURRENT_MONTH,CURRENT_YEAR
device_sn: '', // 设备编号
end_date: null, // 结束时间
industry_type: '', // 行业key
@@ -102,30 +102,6 @@
];
const emit = defineEmits(['search','addTask']);
-
-const handleSearch = () => {
- // 提交至store
- let params = {
- ...searchForm,
- start_date: dateRange.value.length ? `${dateRange.value[0]} 00:00:00` : null,
- end_date: dateRange.value.length ? `${dateRange.value[1]} 23:59:59` : null
- }
- store.commit('setTaskSearchParams', params);
- emit('search', params);
-};
-
-const handleReset = () => {
- dateRange.value = null;
- Object.keys(searchForm).forEach(key => {
- searchForm[key] = '';
- });
- handleSearch();
-};
-
-// 新增任务
-const addTask = () => {
- emit('addTask');
-};
const algorithmChange = (val) => {
searchForm.ai_types = val;
@@ -160,6 +136,7 @@
};
const deptChange = (value) => {
// 处理机巢数据
+ searchForm.device_sn = '';
machineData.value = '';
machineData.value = deptTreeData.value.find(item => item.area_code === value)?.devices || [];
// 所属部门重新请求值
@@ -193,13 +170,42 @@
// model.value = dateRanges[item];
// emit('change', dateRanges[item],timeListEnum[index]);
searchForm.date_enum = timeListEnum[index];
+ handleSearch();
+};
+// 搜索
+const handleSearch = () => {
+ if (!dateRange.value) { dateRange.value = []; }
+ // 提交至store
+ let params = {
+ ...searchForm,
+ start_date: dateRange.value.length ? `${dateRange?.value[0]} 00:00:00` : null,
+ end_date: dateRange.value.length ? `${dateRange?.value[1]} 23:59:59` : null
+ }
+ store.commit('setTaskSearchParams', params);
+ emit('search', params);
+};
+// 重置
+const handleReset = () => {
+ dateRange.value = [];
+ Object.keys(searchForm).forEach(key => {
+ searchForm[key] = '';
+ });
+ searchForm.ai_types = [];
+ searchForm.date_enum = 'TODAY';
+ checked.value = 'today';
+ handleSearch();
};
+// 新增任务
+const addTask = () => {
+ emit('addTask');
+};
onMounted(() => {
- // requestDictionary();
getDeptsByAreaCode();
requestDockInfo();
+ // 查询一次
+ handleSearch();
});
</script>
--
Gitblit v1.9.3