From d643050ffd11f45b4512865c09f4da6754ea90d2 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Sat, 12 Apr 2025 17:46:51 +0800
Subject: [PATCH] feat: 修改任务管理功能
---
src/views/TaskManage/SearchBox.vue | 72 +++++++++++++----------------------
1 files changed, 27 insertions(+), 45 deletions(-)
diff --git a/src/views/TaskManage/SearchBox.vue b/src/views/TaskManage/SearchBox.vue
index dfa9c47..6901583 100644
--- a/src/views/TaskManage/SearchBox.vue
+++ b/src/views/TaskManage/SearchBox.vue
@@ -1,10 +1,10 @@
<template>
<div class="search-box" :class="{ 'is-expand': isExpand }">
<el-form :model="searchForm" inline>
- <div class="search-row">
- <div class="search-items">
- <el-form-item label="名称/编号">
- <el-input v-model="searchForm.key_word" placeholder="请输入任务名称/编号" clearable />
+ <!-- <div class="search-row"> -->
+ <!-- <div class="search-items"> -->
+ <el-form-item>
+ <el-input v-model="searchForm.key_word" placeholder="请输入任务/机巢名称" clearable />
</el-form-item>
<el-form-item label="区域">
<el-select v-model="searchForm.area_code" @change="deptChange" placeholder="请选择部门" clearable>
@@ -16,8 +16,12 @@
<el-option v-for="item in machineData" :key="item.device_sn" :label="item.nickname" :value="item.device_sn" />
</el-select>
</el-form-item>
- </div>
- <div class="search-btns">
+ <el-form-item>
+ <CommonDateTime v-model="newTime" @change="getData" />
+ </el-form-item>
+
+ <!-- </div> -->
+ <!-- <div class="search-btns">
<el-form-item>
<el-button type="primary" @click="handleSearch">查询</el-button>
<el-button @click="handleReset">重置</el-button>
@@ -29,12 +33,12 @@
</el-icon>
</el-button>
</el-form-item>
- </div>
- </div>
+ </div> -->
+ <!-- </div> -->
<!-- 展开后显示的更多搜索条件 -->
- <div v-show="isExpand" class="search-more">
- <div class="search-row">
- <el-form-item label="周期类型">
+ <!-- <div v-show="isExpand" class="search-more"> -->
+ <!-- <div class="search-row"> -->
+ <!-- <el-form-item label="周期类型">
<el-select v-model="searchForm.date_enum" placeholder="请选择状态" clearable>
<el-option label="日" value="DAY" />
<el-option label="周" value="CURRENT_WEEK" />
@@ -51,16 +55,16 @@
end-placeholder="结束日期"
value-format="YYYY-MM-DD"
/>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="任务算法">
<!-- <el-select v-model="searchForm.ai_types" placeholder="请选择算法" clearable>
<el-option v-for="item in taskAlgorithm" :key="item.id" :label="item.dictValue" :value="item.dictKey" />
</el-select> -->
<TaskAlgorithmBusiness :showAlgorithm="true" @algorithmChange="algorithmChange"/>
</el-form-item>
- </div>
- <div class="search-row">
- <el-form-item label="所属部门">
+ <!-- </div> -->
+ <!-- <div class="search-row"> -->
+ <!-- <el-form-item label="所属部门">
<el-select v-model="searchForm.create_dept" placeholder="请选择部门" clearable>
<el-option v-for="item in deptData" :key="item.id" :label="item.deptName" :value="item.id" />
</el-select>
@@ -71,17 +75,16 @@
</el-select>
</el-form-item>
<el-form-item label="任务类型">
- <!-- <el-select v-model="searchForm.industry_type" placeholder="请选择类型" clearable>
- <el-option v-for="item in taskBusiness" :key="item.id" :label="item.dictValue" :value="item.dictKey" />
- </el-select> -->
<TaskAlgorithmBusiness :showBusiness="true" @businessChange="businessChange"/>
- </el-form-item>
- </div>
- </div>
+ </el-form-item> -->
+ <!-- </div> -->
+ <!-- </div> -->
</el-form>
</div>
</template>
<script setup>
+import { pxToRem } from '@/utils/rem'
+import CommonDateTime from '@/components/CommonDateTime.vue'
import { deptsByAreaCode, getDockInfo } from '@/api/home/common';
import TaskAlgorithmBusiness from './components/TaskAlgorithmBusiness.vue';
@@ -135,19 +138,6 @@
emit('addTask');
};
-// let taskAlgorithm = ref([]);
-// let taskBusiness = ref([]);
-
-// 请求字典字段
-// const requestDictionary = () => {
-// getDictionary('SF,HYLB').then((res) => {
-// if (res.code !== 0) {
-// // 处理数据
-// taskAlgorithm.value = res.data.data['SF'];
-// taskBusiness.value = res.data.data['HYLB'];
-// }
-// });
-// };
const algorithmChange = (val) => {
searchForm.ai_types = val;
};
@@ -199,18 +189,10 @@
<style lang="scss" scoped>
.search-box {
- position: absolute;
- top: 340px;
- left: 40px;
- width: calc(100% - 80px);
- height: 60px;
- line-height: 60px;
- background: rgba(31, 62, 122, 0.95);
- // padding: 10px 20px;
transition: all 0.3s;
- &.is-expand {
- height: auto;
- }
+ // &.is-expand {
+ // height: auto;
+ // }
.search-row {
display: flex;
// justify-content: space-between;
--
Gitblit v1.9.3